From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 17 Aug 2010 07:03:07 +0000 (-0500)
Subject: merge script: --squash, --ff from unborn branch are errors
X-Git-Tag: v1.7.3-rc0~16^2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22e0560a70f4b5bfbbf571647e03fa154a6d6bd1;p=git.git

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

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>
---

diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 8f617fcb7..72853cf7f 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"