Make git-repack use git-pack-intersect.

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-repack.sh b/git-repack.sh
index d341966efba783b294792c9a13915982f70a1f73..3f28300566bb78e736af12670027279ee18bce51 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -32,10 +32,6 @@ case ",$all_into_one," in
        rev_list=
        rev_parse='--all'
        pack_objects=
        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
        ;;
 esac
 if [ "$local" ]; then


@@ -46,6 +42,14 @@ name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) |
        exit 1
 if [ -z "$name" ]; then
        echo Nothing new to 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-intersect -a)
+               if test "$redundant" != "" ; then
+                       echo $redundant | xargs rm
+               fi
+       fi

        exit 0
 fi
 echo "Pack pack-$name created."
        exit 0
 fi
 echo "Pack pack-$name created."


@@ -58,20 +62,10 @@ exit
 
 if test "$remove_redandant" = t
 then
 
 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
-               sync
-               ( 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-intersect -a)
+       if test "$redundant" != "" ; then
+               echo $redundant | xargs rm

        fi
 fi
 
        fi
 fi