[PATCH 12/24] merge script: --squash, --ff from unborn branch are errors
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- contrib/examples/git-merge.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 8f617fc..72853cf 100755
--- 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"
--
1.7.2.1.544.ga752d.dirty