X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-octopus.sh;h=645e1147dc886f2b1ca6d2020b44db746b082bf0;hb=689b4d552b8108d2c92c63258990ecd2bc791739;hp=bb58e22a18bdaefae3f8005e7b0a0cfaba4b4185;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index bb58e22a1..645e1147d 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
@@ -40,19 +45,27 @@ esac
 # MRT is the current "merge result tree"
 
 MRC=$head MSG= PARENT="-p $head"
-MRT=$(git-write-tree)
+MRT=$(git write-tree)
 CNT=1 ;# counting our head
 NON_FF_MERGE=0
+OCTOPUS_FAILURE=0
 for SHA1 in $remotes
 do
-	common=$(git-merge-base --all $MRC $SHA1) ||
+	case "$OCTOPUS_FAILURE" in
+	1)
+		# We allow only last one to have a hand-resolvable
+		# conflicts.  Last round failed and we still had
+		# a head to merge.
+		echo "Automated merge did not work."
+		echo "Should not be doing an Octopus."
+		exit 2
+	esac
+
+	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
 		;;
@@ -69,22 +82,22 @@ do
 		# We still need to count this as part of the parent set.
 
 		echo "Fast forwarding to: $SHA1"
-		git-read-tree -u -m $head $SHA1 || exit
-		MRC=$SHA1 MRT=$(git-write-tree)
+		git read-tree -u -m $head $SHA1 || exit
+		MRC=$SHA1 MRT=$(git write-tree)
 		continue
 	fi
 
 	NON_FF_MERGE=1
 
 	echo "Trying simple merge with $SHA1"
-	git-read-tree -u -m $common $MRT $SHA1 || exit 2
-	next=$(git-write-tree 2>/dev/null)
+	git read-tree -u -m --aggressive  $common $MRT $SHA1 || exit 2
+	next=$(git write-tree 2>/dev/null)
 	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
-		next=$(git-write-tree 2>/dev/null)
+		OCTOPUS_FAILURE=1
+		next=$(git write-tree 2>/dev/null)
 	fi
 
 	# We have merged the other branch successfully.  Ideally
@@ -98,4 +111,4 @@ do
 	MRT=$next
 done
 
-exit 0
+exit "$OCTOPUS_FAILURE"