diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 09:53:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 09:53:58 -0700 |
| commit | 4aaef1064a1091ec38ab6adc823f26b82cf4998d (patch) | |
| tree | 2cc561c8cd57aefc641f5ff8b5719377b08763ad | |
| parent | 3b7d368f34715003c834233d9f23456bcb62b44a (diff) | |
| download | git-4aaef1064a1091ec38ab6adc823f26b82cf4998d.tar.gz git-4aaef1064a1091ec38ab6adc823f26b82cf4998d.tar.xz | |
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.
| -rwxr-xr-x | git-pull-script | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script index b873203cc..43114167a 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) |