merge script: --squash, --ff from unborn branch are errors
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:03:07 +0000 (02:03 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
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>
contrib/examples/git-merge.sh

index 8f617fcb7089caedce163871c3eb3a97eadb204b..72853cf7feecb67933a87ef153d0fddbe858a79f 100755 (executable)
@@ -245,6 +245,10 @@ then
                exit 1
        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") ||
                die "$1 - not something we can merge"