X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull-script;h=77d68d7dae4dca516974ba1d60c469f8f85ed2fb;hb=a6ef3518f9ac8a1c46a36c8d27173b1f73d839c4;hp=b04a9be21b9f57ba4b10501414dbd5ecc892d96b;hpb=839a7a06f35bf8cd563a41d6db97f453ab108129;p=git.git

diff --git a/git-pull-script b/git-pull-script
index b04a9be2..77d68d7d 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -5,11 +5,13 @@
 #
 merge_repo=$1
 
+rm -f .git/MERGE_HEAD
+
 echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/ .git/
+rsync -avz --ignore-existing $merge_repo/objects/. .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)
@@ -33,7 +35,7 @@ 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
+	read-tree -m $merge_tree && checkout-cache -f -a && update-cache --refresh
 	echo $merge_head > .git/HEAD
 	exit 0
 fi
@@ -43,4 +45,4 @@ 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
-read-tree $result_tree && checkout-cache -f -a
+checkout-cache -f -a && update-cache --refresh