From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 7 Jun 2005 02:37:25 +0000 (-0700)
Subject: git-resolve-script: stop when the automated merge fails
X-Git-Tag: v0.99~329
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e5b905c4481a3364070094b8ce0c2bf7fa5d481e;p=git.git

git-resolve-script: stop when the automated merge fails

No point in doing a tree write that will just throw
confusing messages on the screen.
---

diff --git a/git-resolve-script b/git-resolve-script
index 74fb2875b..cd6e25a8a 100644
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -47,7 +47,11 @@ merge_msg="Merge of $merge_repo"
 result_tree=$(git-write-tree  2> /dev/null)
 if [ $? -ne 0 ]; then
 	echo "Simple merge failed, trying Automatic merge"
-	git-merge-cache git-merge-one-file-script -a
+	git-merge-cache -o git-merge-one-file-script -a
+	if [ $? -ne 0 ]; then
+		echo "Automatic merge failed, fix up by hand"
+		exit 1
+	fi
 	merge_msg="Automatic merge of $merge_repo"
 	result_tree=$(git-write-tree) || exit 1
 fi