summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-04-18 23:49:21 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-18 23:49:21 (GMT)
commit0ffb0bcaf6ab6277527f6ac8623632a9de55114d (patch)
tree94f78c7ef426cabf0198428e501ad304834815c2
parent4789576e0e5364dcd3916ef583b2ea61bef23f24 (diff)
downloadgit-0ffb0bcaf6ab6277527f6ac8623632a9de55114d.zip
git-0ffb0bcaf6ab6277527f6ac8623632a9de55114d.tar.gz
git-0ffb0bcaf6ab6277527f6ac8623632a9de55114d.tar.bz2
[PATCH] Do not let rsync obliterate .git/object symbolic link.
Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rwxr-xr-xgit-pull-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script
index 407488a..b873203 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -6,7 +6,7 @@
merge_repo=$1
echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/ .git/
+rsync -avz --ignore-existing $merge_repo/objects/. .git/objects/.
echo "Getting remote head"
rsync -avz $merge_repo/HEAD .git/MERGE_HEAD