X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-pull-script;h=4220e187321e21d18d84481c98c473fb45cca86b;hb=11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3;hp=b873203ccc70292c08aa0c996ec02b757a93c3ef;hpb=0ffb0bcaf6ab6277527f6ac8623632a9de55114d;p=git.git

diff --git a/git-pull-script b/git-pull-script
index b873203cc..4220e1873 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -5,24 +5,27 @@
 #
 merge_repo=$1
 
+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/.
+rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
 
 echo "Getting remote head"
-rsync -avz $merge_repo/HEAD .git/MERGE_HEAD
+rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1
 
 head=$(cat .git/HEAD)
 merge_head=$(cat .git/MERGE_HEAD)
-common=$(merge-base $head $merge_head)
+common=$(git-merge-base $head $merge_head)
 if [ -z "$common" ]; then
 	echo "Unable to find common commit between" $merge_head $head
 	exit 1
 fi
 
 # Get the trees associated with those commits
-common_tree=$(cat-file commit $common | sed 's/tree //;q')
-head_tree=$(cat-file commit $head | sed 's/tree //;q')
-merge_tree=$(cat-file commit $merge_head | sed 's/tree //;q')
+common_tree=$(git-cat-file commit $common | sed 's/tree //;q')
+head_tree=$(git-cat-file commit $head | sed 's/tree //;q')
+merge_tree=$(git-cat-file commit $merge_head | sed 's/tree //;q')
 
 if [ "$common" == "$merge_head" ]; then
 	echo "Already up-to-date. Yeeah!"
@@ -33,14 +36,21 @@ if [ "$common" == "$head" ]; then
 	echo "Destroying all noncommitted data!"
 	echo "Kill me within 3 seconds.."
 	sleep 3
-	read-tree $merge_tree && checkout-cache -f -a && update-cache --refresh
+	git-read-tree -m $merge_tree && git-checkout-cache -f -a && git-update-cache --refresh
 	echo $merge_head > .git/HEAD
 	exit 0
 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)
+git-read-tree -m $common_tree $head_tree $merge_tree
+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
+	merge_msg="Automatic merge of $merge_repo"
+	result_tree=$(git-write-tree) || exit 1
+fi
+result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge_head)
 echo "Committed merge $result_commit"
 echo $result_commit > .git/HEAD
-read-tree $result_tree && checkout-cache -f -a && update-cache --refresh
+git-checkout-cache -f -a && git-update-cache --refresh