Merge branch 'jc/cocci-preincr' into maint

diff --git a/builtin/repack.c b/builtin/repack.c
index d5886039cc6656609962fd522a27f61eda6cd0ec..3c30e16ec5483c2a88cbe96f67475746487b31a9 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -531,6 +531,12 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                if (!po_args.quiet && isatty(2))
                        opts |= PRUNE_PACKED_VERBOSE;
                prune_packed_objects(opts);
+
+               if (!keep_unreachable &&
+                   (!(pack_everything & LOOSEN_UNREACHABLE) ||
+                    unpack_unreachable) &&
+                   is_repository_shallow(the_repository))
+                       prune_shallow(PRUNE_QUICK);
        }
 
        if (!no_update_server_info)