summaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-17 23:01:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-17 23:01:23 (GMT)
commitbee5e65c75d53efe00654a181542dbb5e3b5b53b (patch)
treed804d54068073f59499f40d3655f4b93dd32329b /git-repack.sh
parentee438efbc1a05382fa6f2ab59e7d07240a5013be (diff)
parente32dfec79f99738df3c2ffca8a9b2257c9b681fb (diff)
downloadgit-bee5e65c75d53efe00654a181542dbb5e3b5b53b.zip
git-bee5e65c75d53efe00654a181542dbb5e3b5b53b.tar.gz
git-bee5e65c75d53efe00654a181542dbb5e3b5b53b.tar.bz2
Merge branch 'tr/maint-git-repack-tmpfile'
* tr/maint-git-repack-tmpfile: repack: place temporary packs under .git/objects/pack/
Diffstat (limited to 'git-repack.sh')
-rwxr-xr-xgit-repack.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-repack.sh b/git-repack.sh
index 769baaf..624feec 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -52,7 +52,7 @@ true)
esac
PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
-PACKTMP="$GIT_OBJECT_DIRECTORY/.tmp-$$-pack"
+PACKTMP="$PACKDIR/.tmp-$$-pack"
rm -f "$PACKTMP"-*
trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
@@ -82,6 +82,8 @@ case ",$all_into_one," in
;;
esac
+mkdir -p "$PACKDIR" || exit
+
args="$args $local ${GIT_QUIET:+-q} $no_reuse$extra"
names=$(git pack-objects --keep-true-parents --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
exit 1
@@ -90,7 +92,6 @@ if [ -z "$names" ]; then
fi
# Ok we have prepared all new packfiles.
-mkdir -p "$PACKDIR" || exit
# First see if there are packs of the same name and if so
# if we can move them out of the way (this can happen if we