kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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.
maint
Linus Torvalds 2005-04-19 09:53:58 -07:00
parent 3b7d368f34
commit 4aaef1064a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-pull-script
View File

@ -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)