X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull-script;h=5111da98e68f4c3eb44499d20a210966dd445212;hb=77eb2720460a3061ecdf3456d96a7093565fb4e9;hp=77d68d7dae4dca516974ba1d60c469f8f85ed2fb;hpb=8ccfbf3279b07028035aeb58baed5c4a79b63567;p=git.git

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