From d840b3b285a0e6d742c687d344ddefd05e02c60a Mon Sep 17 00:00:00 2001 From: Rene Scharfe Date: Fri, 29 Apr 2005 12:08:03 -0700 Subject: [PATCH] [PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-script If you set SHA1_FILE_DIRECTORY to something else than .git/objects git-pull-script will store the fetched files in a location the rest of the tools does not expect. git-prune-script also ignores this setting, but I think this is good, because pruning a shared tree to fit a single project means throwing away a lot of useful data. :-) Signed-off-by: Rene Scharfe Signed-off-by: Linus Torvalds --- git-pull-script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-pull-script b/git-pull-script index 5111da98..0198c480 100755 --- a/git-pull-script +++ b/git-pull-script @@ -9,7 +9,7 @@ rm -f .git/MERGE_HEAD .git/ORIG_HEAD cp .git/HEAD .git/ORIG_HEAD echo "Getting object database" -rsync -avz --ignore-existing $merge_repo/objects/. .git/objects/. +rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/. echo "Getting remote head" rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1 -- 2.11.0