From: Daniel Barkalow <barkalow@iabervon.org>
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~325^2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cfb8f898a883e2fb2fd5ecec0fe83662b64f1373?hp=cfb8f898a883e2fb2fd5ecec0fe83662b64f1373

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>
---