X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-octopus.sh;h=d1f9f3d2d046395cea94a85a5861fc353afb8ec4;hb=8a1a120c55a67c3193e136a06826585711717399;hp=bb58e22a18bdaefae3f8005e7b0a0cfaba4b4185;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index bb58e22a..d1f9f3d2 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -8,6 +8,11 @@
 LF='
 '
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 # The first parameters up to -- are merge bases; the rest are heads.
 bases= head= remotes= sep_seen=
 for arg
@@ -48,11 +53,8 @@ do
 	common=$(git-merge-base --all $MRC $SHA1) ||
 		die "Unable to find common commit with $SHA1"
 
-	case "$common" in
-	?*"$LF"?*)
-		die "Not trivially mergeable."
-		;;
-	$SHA1)
+	case "$LF$common$LF" in
+	*"$LF$SHA1$LF"*)
 		echo "Already up-to-date with $SHA1"
 		continue
 		;;
@@ -82,8 +84,11 @@ do
 	if test $? -ne 0
 	then
 		echo "Simple merge did not work, trying automatic merge."
-		git-merge-index -o git-merge-one-file -a ||
-		exit 2 ; # Automatic merge failed; should not be doing Octopus
+		git-merge-index -o git-merge-one-file -a || {
+			echo "Not trivially merged."
+			echo "Should not be doing an Octopus."
+			exit 2
+		}
 		next=$(git-write-tree 2>/dev/null)
 	fi