Merge branch 'maint-1.6.0' into maint

diff --git a/git-repack.sh b/git-repack.sh
index 4d313d136e64678b99179b2e1dce7a1beaa36d04..458a497af810c7bb188a5aafb80c32aa0bc05264 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -71,7 +71,8 @@ case ",$all_into_one," in
                                existing="$existing $e"
                        fi
                done
-               if test -n "$args" -a -n "$unpack_unreachable"
+               if test -n "$args" -a -n "$unpack_unreachable" -a \
+                       -n "$remove_redundant"
                then
                        args="$args $unpack_unreachable"
                fi