Merge branch 'master'

diff --git a/git-repack.sh b/git-repack.sh
index e58fdd6d87d7fb626ec0d36be0b2de9f86f01862..55a7b27dcdc646ea03da49673738e1e024a127c1 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -63,9 +63,22 @@ exit
 if test "$remove_redundant" = t
 then
        sync
-       redundant=$(git-pack-redundant --all)
-       if test "$redundant" != "" ; then
-               echo $redundant | xargs rm
+       if test "$all_into_one" = t
+       then
+               cd "$PACKDIR"
+               existing=`find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
+               for e in $existing
+               do
+                       case "$e" in
+                       ./pack-$name.pack | ./pack-$name.idx) ;;
+                       *)      rm -f $e ;;
+                       esac
+               done
+       else
+               redundant=$(git-pack-redundant --all)
+               if test "$redundant" != "" ; then
+                       echo $redundant | xargs rm
+               fi
        fi
 fi