diff options
| author |  Daniel Barkalow <barkalow@iabervon.org> | 2007-09-28 19:34:17 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-29 22:11:52 -0700 |
| commit | cfb8f898a883e2fb2fd5ecec0fe83662b64f1373 (patch) | |
| tree | 69ec849b65636b663d71b25e8688ae6c0ad261fc | |
| parent | Prevent send-pack from segfaulting when a branch doesn't match (diff) | |
| download | tgif-cfb8f898a883e2fb2fd5ecec0fe83662b64f1373.tar.xz | |
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 <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index 2f639ccef2..ac68ff592e 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) |