Merge branch 'th/diff'

diff --git a/git-repack.sh b/git-repack.sh
index bc901126bf7065e87ae194aaaec3518b90eea290..640ad8d90b9a9afd00506a9697af1d3e560e1255 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,6 +17,8 @@ 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
@@ -29,12 +31,10 @@ PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
 case ",$all_into_one," in
 ,,)
        rev_list='--unpacked'
-       rev_parse='--all'
        pack_objects='--incremental'
        ;;
 ,t,)
        rev_list=
-       rev_parse='--all'
        pack_objects=
 
        # Redundancy check in all-into-one case is trivial.
@@ -42,21 +42,37 @@ case ",$all_into_one," in
            find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
        ;;
 esac
-pack_objects="$pack_objects $local $quiet $no_reuse_delta"
-name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) 2>&1 |
+pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra"
+name=$(git-rev-list --objects --all $rev_list 2>&1 |
        git-pack-objects --non-empty $pack_objects .tmp-pack) ||
        exit 1
 if [ -z "$name" ]; then
        echo Nothing new to pack.
-       exit 0
-fi
-echo "Pack pack-$name created."
-
-mkdir -p "$PACKDIR" || exit
+else
+       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 .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
+       mv -f .tmp-pack-$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
 then