aboutsummaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>2005-04-29 12:08:03 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-29 12:08:03 -0700
commitd840b3b285a0e6d742c687d344ddefd05e02c60a (patch)
tree63e9cdf5ff724bf462d9dc408b9c951985d4cecf /git-pull-script
parentdb413479f1bb0dabfc613b2b0017ca74aeb5a919 (diff)
downloadgit-d840b3b285a0e6d742c687d344ddefd05e02c60a.tar.gz
git-d840b3b285a0e6d742c687d344ddefd05e02c60a.tar.xz
[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 <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'git-pull-script')
-rwxr-xr-xgit-pull-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script
index 5111da98e..0198c4805 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