Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1
[git/git.git] / git-repack.sh
index 00c597e..0868734 100755 (executable)
@@ -60,6 +60,7 @@ case ",$all_into_one," in
        args='--unpacked --incremental'
        ;;
 ,t,)
+       args= existing=
        if [ -d "$PACKDIR" ]; then
                for e in `cd "$PACKDIR" && find . -type f -name '*.pack' \
                        | sed -e 's/^\.\///' -e 's/\.pack$//'`
@@ -67,11 +68,10 @@ case ",$all_into_one," in
                        if [ -e "$PACKDIR/$e.keep" ]; then
                                : keep
                        else
-                               args="$args --unpacked=$e.pack"
                                existing="$existing $e"
                        fi
                done
-               if test -n "$args" -a -n "$unpack_unreachable" -a \
+               if test -n "$existing" -a -n "$unpack_unreachable" -a \
                        -n "$remove_redundant"
                then
                        args="$args $unpack_unreachable"