Re: [PATCH] Allow abbreviations in the first refspec to be merged

From: Shawn O. Pearce <spearce@spearce.org>
Date: Sep 28, 2007, 23:38 UTC
Message-ID: <20070928233850.GY3099@spearce.org>
In-Reply-To: <Pine.LNX.4.64.0709281932550.5926@iabervon.org>

Daniel Barkalow <barkalow@iabervon.org> wrote:

> The config item for a refspec side and the ref name that it matches
> aren't necessarily character-for-character identical.

[snip]

Show 13 quoted lines

> diff --git a/builtin-fetch.c b/builtin-fetch.c
> index 2f639cc..ac68ff5 100644
> --- a/builtin-fetch.c
> +++ b/builtin-fetch.c
> @@ -102,7 +102,7 @@ static struct ref *get_ref_map(struct transport *transport,
>  				    remote->fetch[i].dst[0])
>  					*autotags = 1;
>  				if (!i && !has_merge && ref_map &&
> -				    !strcmp(remote->fetch[0].src, ref_map->name))
> +				    !remote->fetch[0].pattern)
>  					ref_map->merge = 1;
>  			}
>  			if (has_merge)

Ooooooooooooh. Of course. That makes perfect sense now that I see your explanation and patch. Thanks for fixing that! :-)

-- 
Shawn.