Merge branch 'fix'

diff --git a/git-repack.sh b/git-repack.sh
index f34720701b0a666823bcde0da3d5b67cd2b54d9e..1fafb6ecf6ffbac817865470ec923af203da8e7e 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -3,7 +3,8 @@
 # Copyright (c) 2005 Linus Torvalds
 #
 
-. git-sh-setup || die "Not a git archive"
+USAGE='[-a] [-d] [-l] [-n]'
+. git-sh-setup
        
 no_update_info= all_into_one= remove_redundant= local=
 while case "$#" in 0) break ;; esac
@@ -11,9 +12,9 @@ do
        case "$1" in
        -n)     no_update_info=t ;;
        -a)     all_into_one=t ;;
-       -d)     remove_redandant=t ;;
+       -d)     remove_redundant=t ;;
        -l)     local=t ;;
-       *)      break ;;
+       *)      usage ;;
        esac
        shift
 done
@@ -32,24 +33,20 @@ case ",$all_into_one," in
        rev_list=
        rev_parse='--all'
        pack_objects=
+
+       # 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) |
+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
        echo Nothing new to pack.
-       if test "$remove_redandant" = t ; then
-               echo "Removing redundant packs."
-               sync
-               redundant=$(git-pack-redundant --all)
-               if test "$redundant" != "" ; then
-                       echo $redundant | xargs rm
-               fi
-       fi
        exit 0
 fi
 echo "Pack pack-$name created."
@@ -60,12 +57,22 @@ 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
-       sync
-       redundant=$(git-pack-redundant --all)
-       if test "$redundant" != "" ; then
-               echo $redundant | xargs rm
+       # 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
+                       case "$e" in
+                       ./pack-$name.pack | ./pack-$name.idx) ;;
+                       *)      rm -f $e ;;
+                       esac
+                 done
+               )
        fi
 fi