Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/git-repack.sh b/git-repack.sh
index 49547a77c75356fb12dc3c9451a8983e06f81240..bc901126bf7065e87ae194aaaec3518b90eea290 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -3,17 +3,21 @@
 # Copyright (c) 2005 Linus Torvalds
 #
 
-. git-sh-setup || die "Not a git archive"
+USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
+. git-sh-setup
        
-no_update_info= all_into_one= remove_redundant= local=
+no_update_info= all_into_one= remove_redundant=
+local= quiet= no_reuse_delta=
 while case "$#" in 0) break ;; esac
 do
        case "$1" in
        -n)     no_update_info=t ;;
        -a)     all_into_one=t ;;
-       -d)     remove_redandant=t ;;
-       -l)     local=t ;;
-       *)      break ;;
+       -d)     remove_redundant=t ;;
+       -q)     quiet=-q ;;
+       -f)     no_reuse_delta=--no-reuse-delta ;;
+       -l)     local=--local ;;
+       *)      usage ;;
        esac
        shift
 done
@@ -32,16 +36,14 @@ case ",$all_into_one," in
        rev_list=
        rev_parse='--all'
        pack_objects=
-       # This part is a stop-gap until we have proper pack redundancy
-       # checker.
+
+       # Redundancy check in all-into-one case is trivial.
        existing=`cd "$PACKDIR" && \
            find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
        ;;
 esac
-if [ "$local" ]; then
-       pack_objects="$pack_objects --local"
-fi
-name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) |
+pack_objects="$pack_objects $local $quiet $no_reuse_delta"
+name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) 2>&1 |
        git-pack-objects --non-empty $pack_objects .tmp-pack) ||
        exit 1
 if [ -z "$name" ]; then
@@ -56,12 +58,13 @@ mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
 mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
 exit
 
-if test "$remove_redandant" = t
+if test "$remove_redundant" = t
 then
-       # We know $existing are all redandant only when
+       # We know $existing are all redundant only when
        # all-into-one is used.
        if test "$all_into_one" != '' && test "$existing" != ''
        then
+               sync
                ( cd "$PACKDIR" &&
                  for e in $existing
                  do
@@ -72,6 +75,7 @@ then
                  done
                )
        fi
+       git-prune-packed
 fi
 
 case "$no_update_info" in