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.
20 years ago · 4aaef1064a
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@ -5,11 +5,13 @@
				@@ -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)