On Mon, 2015-11-09 at 18:54 +0000, Ramsay Jones wrote: > > On 09/11/15 17:03, Michael Haggerty wrote: > > From: David Turner <dturner@xxxxxxxxxxxxxxxx> > > > > is_branch was already non-static, but this patch declares it in the > > header. > > > > Signed-off-by: Ronnie Sahlberg <sahlberg@xxxxxxxxxx> > > Signed-off-by: David Turner <dturner@xxxxxxxxxxxxxxxx> > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > > Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx> > > --- > > refs.h | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/refs.h b/refs.h > > index 6d30c98..39b8edc 100644 > > --- a/refs.h > > +++ b/refs.h > > @@ -217,6 +217,8 @@ extern void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct st > > */ > > int pack_refs(unsigned int flags); > > > > +int is_branch(const char *refname); > > + > > /* > > * Flags controlling ref_transaction_update(), ref_transaction_create(), etc. > > * REF_NODEREF: act on the ref directly, instead of dereferencing > > > > I don't understand, is_branch() is already declared in refs.h, see line 67. > > This is true in master, next and pu now appears to have two declarations. Agreed. This was necessary at the time I started on this work, but this patch apparently stuck around past the time it was needed. Please drop. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html