diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-19 01:49:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-19 01:49:21 +0200 |
| commit | 0ffb0bcaf6ab6277527f6ac8623632a9de55114d (patch) | |
| tree | 94f78c7ef426cabf0198428e501ad304834815c2 /git-pull-script | |
| parent | [PATCH] show-diff.c: -R option for reverse diff. (diff) | |
| download | git-0ffb0bcaf6ab6277527f6ac8623632a9de55114d.tar.xz git-0ffb0bcaf6ab6277527f6ac8623632a9de55114d.zip | |
[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>
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script index 407488ae94..b873203ccc 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 |