Merge branch 'mp/upload-pack-use-embedded-args'

diff --git a/builtin/prune.c b/builtin/prune.c
index 10b03d3e4cb5ced78118251ac390dd6a33f9a71b..8f4f0522856b988a8798fd65c6d81d8826709aa2 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -119,6 +119,9 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 
        argc = parse_options(argc, argv, prefix, options, prune_usage, 0);
 
+       if (repository_format_precious_objects)
+               die(_("cannot prune in a precious-objects repo"));
+
        while (argc--) {
                unsigned char sha1[20];
                const char *name = *argv++;