Make git-pull-script do the right thing for symlinked HEAD's.

Also exit gracefully if the HEAD pull failed, rather than use
a possibly stale MERGE_HEAD.

diff --git a/git-pull-script b/git-pull-script
index b873203ccc70292c08aa0c996ec02b757a93c3ef..43114167ad693f37e686791f2a69accded89c059 100755 (executable)
--- 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/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)