Merge branch 'mk/blame-error-message'

diff --git a/builtin/repack.c b/builtin/repack.c
index 70b9b1eaf17f5447021f7174f31e5c19d9754486..945611006a4ddcad1b834d87fe62698549ebb837 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -193,6 +193,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
        argc = parse_options(argc, argv, prefix, builtin_repack_options,
                                git_repack_usage, 0);
 
+       if (delete_redundant && repository_format_precious_objects)
+               die(_("cannot delete packs in a precious-objects repo"));
+
        if (pack_kept_objects < 0)
                pack_kept_objects = write_bitmaps;