[PATCH] Explain what went wrong on update-cache of new file
[gitweb.git] / git-repack-script
old mode 100644 (file)
new mode 100755 (executable)
index ce35235..80628b5
@@ -1,18 +1,68 @@
 #!/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
+#
+# Copyright (c) 2005 Linus Torvalds
+#
+
+. git-sh-setup-script || die "Not a git archive"
+       
+no_update_info= all_into_one= remove_redundant=
+while case "$#" in 0) break ;; esac
+do
+       case "$1" in
+       -n)     no_update_info=t ;;
+       -a)     all_into_one=t ;;
+       -d)     remove_redandant=t ;;
+       *)      break ;;
+       esac
+       shift
+done
+
+rm -f .tmp-pack-*
+PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
+
+# There will be more repacking strategies to come...
+case ",$all_into_one," in
+,,)
+       rev_list='--unpacked'
+       rev_parse='--all'
+       pack_objects='--incremental'
+       ;;
+,t,)
+       rev_list=
+       rev_parse='--all'
+       pack_objects=
+       # This part is a stop-gap until we have proper pack redundancy
+       # checker.
+       existing=`cd "$PACKDIR" && \
+           find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
+       ;;
+esac
+name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) |
+       git-pack-objects --non-empty $pack_objects .tmp-pack) ||
        exit 1
+if [ -z "$name" ]; then
+       echo Nothing new to pack.
+       exit 0
 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
+echo "Pack pack-$name created."
 
-if [ ! -f $packname.idx ]; then
-       echo Nothing new to pack
-       exit 0
+mkdir -p "$PACKDIR" || exit
+
+mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
+mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
+exit
+
+if test "$remove_redandant" = t
+then
+       # We know $existing are all redandant only when
+       # all-into-one is used.
+       if test "$all_into_one" != '' && test "$existing" != ''
+       then
+               ( cd "$PACKDIR" && rm -f $existing )
+       fi
 fi
-mv $packname.idx $packname.pack "$GIT_OBJECT_DIRECTORY/pack/"
+
+case "$no_update_info" in
+t) : ;;
+*) git-update-server-info ;;
+esac