mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'tr/maint-git-repack-tmpfile'
* tr/maint-git-repack-tmpfile: repack: place temporary packs under .git/objects/pack/
This commit is contained in:
commit
bee5e65c75
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue