format-patch: introduce --base=auto option

diff --git a/builtin/prune.c b/builtin/prune.c

index 04d3b12ae4e8c13ab4c232398fe1bdb3c91a7457..8f4f0522856b988a8798fd65c6d81d8826709aa2 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -6,7 +6,6 @@
  #include "reachable.h"
  #include "parse-options.h"
  #include "progress.h"
-#include "dir.h"
  
  static const char * const prune_usage[] = {
         N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
@@ -115,9 +114,14 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
         expire = ULONG_MAX;
         save_commit_buffer = 0;
         check_replace_refs = 0;
+       ref_paranoia = 1;
         init_revisions(&revs, 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++;