From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 26 Apr 2005 19:26:46 +0000 (-0700)
Subject: git-pull-script: do automatic merges
X-Git-Tag: v0.99~736
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9831d8f86095edde393e495d7a55cab9d35d5d05;p=git.git

git-pull-script: do automatic merges

When the trivial "read-tree" merge fails, fall back on the (equally
trivial) automatic merge script instead of forcing the user to do
it by hand.

When _that_ fails, you get to do a manual merge.
---

diff --git a/git-pull-script b/git-pull-script
index 77d68d7d..5111da98 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -5,7 +5,8 @@
 #
 merge_repo=$1
 
-rm -f .git/MERGE_HEAD
+rm -f .git/MERGE_HEAD .git/ORIG_HEAD
+cp .git/HEAD .git/ORIG_HEAD
 
 echo "Getting object database"
 rsync -avz --ignore-existing $merge_repo/objects/. .git/objects/.
@@ -41,8 +42,15 @@ if [ "$common" == "$head" ]; then
 fi
 echo "Trying to merge $merge_head into $head"
 read-tree -m $common_tree $head_tree $merge_tree
-result_tree=$(write-tree) || exit 1
-result_commit=$(echo "Merge $merge_repo" | commit-tree $result_tree -p $head -p $merge_head)
+merge_msg="Merge of $merge_repo"
+result_tree=$(write-tree  2> /dev/null)
+if [ $? -ne 0 ]; then
+	echo "Simple merge failed, trying Automatic merge"
+	merge-cache git-merge-one-file-script -a
+	merge_msg="Automatic merge of $merge_repo"
+	result_tree=$(write-tree) || exit 1
+fi
+result_commit=$(echo "$merge_msg" | commit-tree $result_tree -p $head -p $merge_head)
 echo "Committed merge $result_commit"
 echo $result_commit > .git/HEAD
 checkout-cache -f -a && update-cache --refresh