| commit | cfb8f898a883e2fb2fd5ecec0fe83662b64f1373 | |
| author | Daniel Barkalow <barkalow@iabervon.org> | |
| Fri, 28 Sep 2007 23:34:17 +0000 (28 19:34 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 30 Sep 2007 05:11:52 +0000 (29 22:11 -0700) | ||
| tree | 69ec849b65636b663d71b25e8688ae6c0ad261fc | treesnapshot (tar.gz zip) |
| parent | 4491e62ae932d5774f628d1bd3be663c11058a73 | commitdiff |
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>
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>
| builtin-fetch.c | diffblobblamehistory |