development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-merge: fix confusion between tag and branch

Browse source 
In a repository with core.warnambiguousrefs turned off, and with
a branch and a tag that have the same name 'frotz',

	git merge frotz

would merge the commit pointed at by the tag 'frotz' but
incorrectly would identify what was merged as 'branch frotz' in
the merge message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-12-02 16:58:30 -08:00
parent 22b1c7ee01
commit 3683dc5a9a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
git-merge.sh
View file

@ -189,13 +189,13 @@ else
merge_name=$(for remote
do
rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) &&
if git show-ref -q --verify "refs/heads/$remote"
bh=$(git show-ref -s --verify "refs/heads/$remote") &&
if test "$rh" = "$bh"
then
what=branch
echo "$rh branch '$remote' of ."
else
what=commit
fi &&
echo "$rh $what '$remote'"
echo "$rh commit '$remote'"
fi
done | git-fmt-merge-msg
)
merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name"