X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull-script;h=d35a4a1b23bb8af7a13cb07937a0d667ee75fde4;hb=74c7cfa875448c71a18d21a0cc7c973afe759fa5;hp=77d68d7dae4dca516974ba1d60c469f8f85ed2fb;hpb=8ccfbf3279b07028035aeb58baed5c4a79b63567;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 77d68d7d..d35a4a1b 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -4,45 +4,12 @@
 # just hard-codes it.
 #
 merge_repo=$1
-
-rm -f .git/MERGE_HEAD
+merge_name=${2:-HEAD}
 
 echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/objects/. .git/objects/.
-
-echo "Getting remote 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)
-if [ -z "$common" ]; then
-	echo "Unable to find common commit between" $merge_head $head
-	exit 1
-fi
+rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
 
-# 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')
+echo "Getting remote $merge_name"
+rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
 
-if [ "$common" == "$merge_head" ]; then
-	echo "Already up-to-date. Yeeah!"
-	exit 0
-fi
-if [ "$common" == "$head" ]; then
-	echo "Updating from $head to $merge_head."
-	echo "Destroying all noncommitted data!"
-	echo "Kill me within 3 seconds.."
-	sleep 3
-	read-tree -m $merge_tree && checkout-cache -f -a && 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)
-echo "Committed merge $result_commit"
-echo $result_commit > .git/HEAD
-checkout-cache -f -a && update-cache --refresh
+git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"