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

git-repack: create new packs inside $GIT_DIR, not cwd

Browse Source 
Avoid failing when cwd is !writable by writing the
packfiles in $GIT_DIR, which is more in line with other commands.

Without this, git-repack was failing when run from crontab
by non-root user accounts. For large repositories, this
also makes the mv operation a lot cheaper, and avoids leaving
temp packfiles around the fs upon failure.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Martin Langhoff 2006-09-04 17:42:32 +12:00 committed by Junio C Hamano
parent 42cabc341c
commit 0ea2582d1c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-repack.sh
View File

@ -24,8 +24,10 @@ do
shift shift
done done
rm -f .tmp-pack-*
PACKDIR="$GIT_OBJECT_DIRECTORY/pack" PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
PACKTMP="$GIT_DIR/.tmp-$$-pack"
rm -f "$PACKTMP"-*
trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
# There will be more repacking strategies to come... # There will be more repacking strategies to come...
case ",$all_into_one," in case ",$all_into_one," in
@ -42,11 +44,12 @@ case ",$all_into_one," in
find . -type f \( -name '*.pack' -o -name '*.idx' \) -print` find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
;; ;;
esac esac
pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra" pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra"
name=$( { git-rev-list --objects --all $rev_list || name=$( { git-rev-list --objects --all $rev_list ||
echo "git-rev-list died with exit code $?" echo "git-rev-list died with exit code $?"
} | } |
git-pack-objects --non-empty $pack_objects .tmp-pack) || git-pack-objects --non-empty $pack_objects "$PACKTMP") ||
exit 1 exit 1
if [ -z "$name" ]; then if [ -z "$name" ]; then
echo Nothing new to pack. echo Nothing new to pack.
@ -64,8 +67,8 @@ else
"$PACKDIR/old-pack-$name.$sfx" "$PACKDIR/old-pack-$name.$sfx"
fi fi
done && done &&
mv -f .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" && mv -f "$PACKTMP-$name.pack" "$PACKDIR/pack-$name.pack" &&
mv -f .tmp-pack-$name.idx "$PACKDIR/pack-$name.idx" && mv -f "$PACKTMP-$name.idx" "$PACKDIR/pack-$name.idx" &&
test -f "$PACKDIR/pack-$name.pack" && test -f "$PACKDIR/pack-$name.pack" &&
test -f "$PACKDIR/pack-$name.idx" || { test -f "$PACKDIR/pack-$name.idx" || {
echo >&2 "Couldn't replace the existing pack with updated one." echo >&2 "Couldn't replace the existing pack with updated one."