repack: honor -d even when no new pack was created

diff --git a/git-repack.sh b/git-repack.sh
index 3d6fec1c9a480887f68d2bde3c184ca1d85d1933..20774fbd7e281e91c2a3b97d19284ab5282ccaf1 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -29,12 +29,10 @@ PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
 case ",$all_into_one," in
 ,,)
        rev_list='--unpacked'
-       rev_parse='--all'
        pack_objects='--incremental'
        ;;
 ,t,)
        rev_list=
-       rev_parse='--all'
        pack_objects=
 
        # Redundancy check in all-into-one case is trivial.
@@ -43,20 +41,20 @@ case ",$all_into_one," in
        ;;
 esac
 pack_objects="$pack_objects $local $quiet $no_reuse_delta"
-name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) 2>&1 |
+name=$(git-rev-list --objects --all $rev_list 2>&1 |
        git-pack-objects --non-empty $pack_objects .tmp-pack) ||
        exit 1
 if [ -z "$name" ]; then
        echo Nothing new to pack.
-       exit 0
-fi
-echo "Pack pack-$name created."
+else
+       echo "Pack pack-$name created."
 
-mkdir -p "$PACKDIR" || exit
+       mkdir -p "$PACKDIR" || exit
 
-mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
-mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
-exit
+       mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
+       mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
+       exit
+fi
 
 if test "$remove_redundant" = t
 then
@@ -75,6 +73,7 @@ then
                  done
                )
        fi
+       git-prune-packed
 fi
 
 case "$no_update_info" in