mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-29 21:15:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge script: --squash, --ff from unborn branch are errors

Browse Source 
Port v1.6.1-rc1~319 (provide more errors for the "merge into empty
head" case, 2008-08-21) to the example merge script.

Noticed by comparison with builtin merge.

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:03:07 -05:00 committed by Junio C Hamano
parent 2102440c17
commit 22e0560a70
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,10 @@ then
exit 1 exit 1
fi fi
test "$squash" != t ||
die "Squash commit into empty head not supported yet"
test "$allow_fast_forward" = t ||
die "Non-fast-forward into an empty head does not make sense"
rh=$(git rev-parse --verify "$1^0") || rh=$(git rev-parse --verify "$1^0") ||
die "$1 - not something we can merge" die "$1 - not something we can merge"