Add callback data to for_each_ref() family.

diff --git a/git-repack.sh b/git-repack.sh
index 20774fbd7e281e91c2a3b97d19284ab5282ccaf1..b525fc5dfd9053a6fb63a4d38517e25e75341199 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -5,9 +5,9 @@
 
 USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
 . git-sh-setup
-       
+
 no_update_info= all_into_one= remove_redundant=
-local= quiet= no_reuse_delta=
+local= quiet= no_reuse_delta= extra=
 while case "$#" in 0) break ;; esac
 do
        case "$1" in
@@ -17,13 +17,17 @@ do
        -q)     quiet=-q ;;
        -f)     no_reuse_delta=--no-reuse-delta ;;
        -l)     local=--local ;;
+       --window=*) extra="$extra $1" ;;
+       --depth=*) extra="$extra $1" ;;
        *)      usage ;;
        esac
        shift
 done
 
-rm -f .tmp-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...
 case ",$all_into_one," in
@@ -36,24 +40,43 @@ case ",$all_into_one," in
        pack_objects=
 
        # Redundancy check in all-into-one case is trivial.
-       existing=`cd "$PACKDIR" && \
+       existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \
            find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
        ;;
 esac
-pack_objects="$pack_objects $local $quiet $no_reuse_delta"
-name=$(git-rev-list --objects --all $rev_list 2>&1 |
-       git-pack-objects --non-empty $pack_objects .tmp-pack) ||
+
+pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra"
+name=$( { git-rev-list --objects --all $rev_list ||
+         echo "git-rev-list died with exit code $?"
+       } |
+       git-pack-objects --non-empty $pack_objects "$PACKTMP") ||
        exit 1
 if [ -z "$name" ]; then
        echo Nothing new to pack.
 else
-       echo "Pack pack-$name created."
-
+       if test "$quiet" != '-q'; then
+           echo "Pack pack-$name created."
+       fi
        mkdir -p "$PACKDIR" || exit
 
-       mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
-       mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
-       exit
+       for sfx in pack idx
+       do
+               if test -f "$PACKDIR/pack-$name.$sfx"
+               then
+                       mv -f "$PACKDIR/pack-$name.$sfx" \
+                               "$PACKDIR/old-pack-$name.$sfx"
+               fi
+       done &&
+       mv -f "$PACKTMP-$name.pack" "$PACKDIR/pack-$name.pack" &&
+       mv -f "$PACKTMP-$name.idx"  "$PACKDIR/pack-$name.idx" &&
+       test -f "$PACKDIR/pack-$name.pack" &&
+       test -f "$PACKDIR/pack-$name.idx" || {
+               echo >&2 "Couldn't replace the existing pack with updated one."
+               echo >&2 "The original set of packs have been saved as"
+               echo >&2 "old-pack-$name.{pack,idx} in $PACKDIR."
+               exit 1
+       }
+       rm -f "$PACKDIR/old-pack-$name.pack" "$PACKDIR/old-pack-$name.idx"
 fi
 
 if test "$remove_redundant" = t