From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 03 Oct 2014 18:51:28 GMT
Subject: Re: [PATCH 09/24] refs.c: pass a list of names to skip to is_refname_available
Message-ID: <20141003185128.GS1175@google.com>
In-Reply-To: <xmqq61g2nuud.fsf@gitster.dls.corp.google.com>

Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> 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 for the heads up.  (I hadn't realized the ref-transaction-1 was
part of 'master' --- yay!)  Rebased and reworked:
https://code-review.googlesource.com/1027

I'll give a week or so for review comments on this version of the
series and then post a hopefully final version.