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

[git.git] / contrib / examples / git-merge.sh

diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 8f617fcb7089caedce163871c3eb3a97eadb204b..72853cf7feecb67933a87ef153d0fddbe858a79f 100755 (executable)
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -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"