Browse files

repack: place temporary packs under .git/objects/pack/

git-pack-objects is already careful to start out its temporary packs
under .git/objects/pack/ (cf. 8b4eb6b, Do not perform cross-directory
renames when creating packs, 2008-09-22), but git-repack did not
respond in kind so the effort was lost when the filesystem boundary is
exactly at that directory.

Let git-repack pass a path under .git/objects/pack/ as the base for
its temporary packs.

This means we might need the $PACKDIR sooner (before the pack-objects
invocation), so move the mkdir up just to be safe.

Also note that the only use of *.pack is in the find invocation way
before the pack-objects call, so the temporary packs will not suddenly
show up in any wildcards because of the directory change.

Reported-by: Marat Radchenko <>
Signed-off-by: Thomas Rast <>
Signed-off-by: Junio C Hamano <>
  • Loading branch information...
trast authored and gitster committed Oct 19, 2010
1 parent 87b5054 commit e32dfec79f99738df3c2ffca8a9b2257c9b681fb
Showing with 3 additions and 2 deletions.
  1. +3 −2
@@ -50,7 +50,7 @@ true)
rm -f "$PACKTMP"-*
trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
@@ -80,6 +80,8 @@ case ",$all_into_one," in
+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
@@ -88,7 +90,6 @@ if [ -z "$names" ]; then
# 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

0 comments on commit e32dfec

Please sign in to comment.