[PATCH] Update the list of diagnostics for git-commit-tree

[git.git] / git-repack-script

diff --git a/git-repack-script b/git-repack-script
old mode 100644 (file)
new mode 100755 (executable)
index ce35235..15b7fd6
--- a/git-repack-script
+++ b/git-repack-script
@@ -1,18 +1,14 @@
 #!/bin/sh
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
-packname=$(date +"pack-%s")
-if [ -f "$GIT_OBJECT_DIRECTORY/pack/$packname.idx" ]; then
-       echo Pack $packname already exists
+. git-sh-setup-script || die "Not a git archive"
+       
+rm -f .tmp-pack-*
+packname=$(git-rev-list --unpacked --objects $(git-rev-parse --all) |
+       git-pack-objects --non-empty --incremental .tmp-pack) ||
        exit 1
-fi
-rm -f $packname.idx $packname.pack
-git-rev-list --unpacked --objects $(git-rev-parse --all) |
-       git-pack-objects --non-empty --incremental $packname ||
-       exit 1
-
-if [ ! -f $packname.idx ]; then
+if [ -z "$packname" ]; then
        echo Nothing new to pack
        exit 0
 fi
-mv $packname.idx $packname.pack "$GIT_OBJECT_DIRECTORY/pack/"
+mkdir -p "$GIT_OBJECT_DIRECTORY/pack" &&
+mv .tmp-pack-$packname.pack "$GIT_OBJECT_DIRECTORY/pack/pack-$packname.pack" &&
+mv .tmp-pack-$packname.idx  "$GIT_OBJECT_DIRECTORY/pack/pack-$packname.idx"