Merge refs/heads/master from .
[gitweb.git] / git-repack-script
old mode 100644 (file)
new mode 100755 (executable)
index ce35235..1c9a631
@@ -1,18 +1,33 @@
 #!/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
-       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
+#
+# Copyright (c) 2005 Linus Torvalds
+#
 
-if [ ! -f $packname.idx ]; then
+. git-sh-setup-script || die "Not a git archive"
+       
+no_update_info=
+while case "$#" in 0) break ;; esac
+do
+       case "$1" in
+       -n)     no_update_info=t ;;
+       *)      break ;;
+       esac
+       shift
+done
+
+rm -f .tmp-pack-*
+packname=$(git-rev-list --unpacked --objects $(git-rev-parse --all) |
+       git-pack-objects --non-empty --incremental .tmp-pack) ||
+       exit 1
+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" &&
+case "$no_update_info" in
+t) : ;;
+*) git-update-server-info ;;
+esac