repack: use only pack-objects, not rev-list.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-repack.sh b/git-repack.sh
index b525fc5dfd9053a6fb63a4d38517e25e75341199..9ae5092208aab167f9164dd729297d92fa4948c6 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -32,12 +32,10 @@ trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
 # There will be more repacking strategies to come...
 case ",$all_into_one," in
 ,,)
 # There will be more repacking strategies to come...
 case ",$all_into_one," in
 ,,)

-       rev_list='--unpacked'
-       pack_objects='--incremental'
+       args='--unpacked --incremental'

        ;;
 ,t,)
        ;;
 ,t,)

-       rev_list=
-       pack_objects=
+       args=

 
        # Redundancy check in all-into-one case is trivial.
        existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \
 
        # Redundancy check in all-into-one case is trivial.
        existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \


@@ -45,11 +43,8 @@ case ",$all_into_one," in
        ;;
 esac
 
        ;;
 esac
 

-pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra"
-name=$( { git-rev-list --objects --all $rev_list ||
-         echo "git-rev-list died with exit code $?"
-       } |
-       git-pack-objects --non-empty $pack_objects "$PACKTMP") ||
+args="$args $local $quiet $no_reuse_delta$extra"
+name=$(git-pack-objects --non-empty --all $args </dev/null "$PACKTMP") ||

        exit 1
 if [ -z "$name" ]; then
        echo Nothing new to pack.
        exit 1
 if [ -z "$name" ]; then
        echo Nothing new to pack.