Fix git-rev-list "date order" with --topo-order

diff --git a/git-repack.sh b/git-repack.sh
index b395d0ef34758f2e3e3129a5131832e932ab7875..f34720701b0a666823bcde0da3d5b67cd2b54d9e 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -5,13 +5,14 @@
 
 . git-sh-setup || die "Not a git archive"
        
-no_update_info= all_into_one= remove_redundant=
+no_update_info= all_into_one= remove_redundant= local=
 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 ;;
        esac
        shift
@@ -31,17 +32,24 @@ 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.
-       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) |
        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."
@@ -54,19 +62,10 @@ exit
 
 if test "$remove_redandant" = t
 then
-       # We know $existing are all redandant only when
-       # all-into-one is used.
-       if test "$all_into_one" != '' && test "$existing" != ''
-       then
-               ( cd "$PACKDIR" &&
-                 for e in $existing
-                 do
-                       case "$e" in
-                       ./pack-$name.pack | ./pack-$name.idx) ;;
-                       *)      rm -f $e ;;
-                       esac
-                 done
-               )
+       sync
+       redundant=$(git-pack-redundant --all)
+       if test "$redundant" != "" ; then
+               echo $redundant | xargs rm
        fi
 fi