From: Daniel Barkalow Date: Fri, 28 Sep 2007 23:34:17 +0000 (-0400) Subject: Allow abbreviations in the first refspec to be merged X-Git-Tag: v1.5.4-rc0~292^2~29 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cfb8f898a883e2fb2fd5ecec0fe83662b64f1373;p=git.git Allow abbreviations in the first refspec to be merged The config item for a refspec side and the ref name that it matches aren't necessarily character-for-character identical. We actually want to merge a ref by default if: there is no per-branch config, it is the found result of looking for the match for the first refspec, and the first refspec is not a pattern. Beyond that, anything that get_fetch_map() thinks matches is fine. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- diff --git a/builtin-fetch.c b/builtin-fetch.c index 2f639ccef..ac68ff592 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)