Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > diff --git a/refs.c b/refs.c > index f124c2b..6820c93 100644 > --- a/refs.c > +++ b/refs.c > @@ -801,14 +801,16 @@ static int names_conflict(const char *refname1, const char *refname2) > > struct name_conflict_cb { > const char *refname; > - const char *oldrefname; > const char *conflicting_refname; > + struct string_list *skiplist; > }; As cbe73331 (refs: speed up is_refname_available, 2014-09-10) touches the same area and is now in 'master', the logic around here in this series needs to be reworked. Thanks. -- 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