Re: [PATCH 09/24] refs.c: pass a list of names to skip to is_refname_available
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 2, 2014, 19:18 UTC
- Message-ID
- <xmqq61g2nuud.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <20141002020332.GB1175@google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 12 quoted lines
> 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.