Merge branch 'sb/submodule-parallel-fetch'

diff --git a/builtin/repack.c b/builtin/repack.c
index 573e66c1b45f46fe1e1fdd27b0e5755d935f1d23..80dd06b4a2a8b784ab96899cb150b13006d7e402 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -248,6 +248,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                                                "--unpack-unreachable");
                        } else if (keep_unreachable) {
                                argv_array_push(&cmd.args, "--keep-unreachable");
+                               argv_array_push(&cmd.args, "--pack-loose-unreachable");
                        } else {
                                argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
                        }
@@ -387,7 +388,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                                          item->string,
                                          exts[ext].name);
                        if (remove_path(fname))
-                               warning(_("removing '%s' failed"), fname);
+                               warning(_("failed to remove '%s'"), fname);
                        free(fname);
                }
        }