From 4aaef1064a1091ec38ab6adc823f26b82cf4998d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org.(none)>
Date: Tue, 19 Apr 2005 09:53:58 -0700
Subject: [PATCH] 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.
---
 git-pull-script | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git-pull-script b/git-pull-script
index b873203c..43114167 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/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)
-- 
2.11.0