undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/maint-git-repack-tmpfile'

Browse Source 
* tr/maint-git-repack-tmpfile:
  repack: place temporary packs under .git/objects/pack/
This commit is contained in:
Junio C Hamano 2010-11-17 15:01:23 -08:00
commit bee5e65c75
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-repack.sh
View File

@ -52,7 +52,7 @@ true)
esac esac
PACKDIR="$GIT_OBJECT_DIRECTORY/pack" PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
PACKTMP="$GIT_OBJECT_DIRECTORY/.tmp-$$-pack" PACKTMP="$PACKDIR/.tmp-$$-pack"
rm -f "$PACKTMP"-* rm -f "$PACKTMP"-*
trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15 trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
@ -82,6 +82,8 @@ case ",$all_into_one," in
;; ;;
esac esac
mkdir -p "$PACKDIR" || exit
args="$args $local ${GIT_QUIET:+-q} $no_reuse$extra" 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") || names=$(git pack-objects --keep-true-parents --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
exit 1 exit 1
@ -90,7 +92,6 @@ if [ -z "$names" ]; then
fi fi
# Ok we have prepared all new packfiles. # Ok we have prepared all new packfiles.
mkdir -p "$PACKDIR" || exit
# First see if there are packs of the same name and if so # 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 # if we can move them out of the way (this can happen if we