undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge script: notice @{-1} shorthand

Browse Source 
Port v1.6.2-rc1~10^2 (Teach @{-1} to git merge, 2009-02-13) to
the old merge script.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-08-17 02:11:30 -05:00 committed by Junio C Hamano
parent 2a70fa4f1e
commit c2c9a87d4f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/examples/git-merge.sh
View File

@ -148,13 +148,15 @@ merge_name () {
if found_ref=$(git rev-parse --symbolic-full-name --verify \ if found_ref=$(git rev-parse --symbolic-full-name --verify \
"$remote" 2>/dev/null) "$remote" 2>/dev/null)
then then
expanded=$(git check-ref-format --branch "$remote") ||
exit
if test "${found_ref#refs/heads/}" != "$found_ref" if test "${found_ref#refs/heads/}" != "$found_ref"
then then
echo "$rh branch '$remote' of ." echo "$rh branch '$expanded' of ."
return return
elif test "${found_ref#refs/remotes/}" != "$found_ref" elif test "${found_ref#refs/remotes/}" != "$found_ref"
then then
echo "$rh remote branch '$remote' of ." echo "$rh remote branch '$expanded' of ."
return return
fi fi
fi fi