On 09/11/15 17:03, Michael Haggerty wrote: > From: David Turner <dtur...@twopensource.com> > > is_branch was already non-static, but this patch declares it in the > header. > > Signed-off-by: Ronnie Sahlberg <sahlb...@google.com> > Signed-off-by: David Turner <dtur...@twopensource.com> > Signed-off-by: Junio C Hamano <gits...@pobox.com> > Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu> > --- > 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. ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
