summaryrefslogtreecommitdiff
path: root/builtin/prune.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-26 22:55:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-26 22:55:25 (GMT)
commitfa46579555583a9799d8495f632b14cddd65db6e (patch)
treea2f1155dfc4bd642795ec59e943776ef68e26f67 /builtin/prune.c
parent9d4a0692dcd528501ced5cfde64bd9af1b67d803 (diff)
parent067fbd4105c5aa8260a73cc6961854be0e93fa03 (diff)
downloadgit-fa46579555583a9799d8495f632b14cddd65db6e.zip
git-fa46579555583a9799d8495f632b14cddd65db6e.tar.gz
git-fa46579555583a9799d8495f632b14cddd65db6e.tar.bz2
Merge branch 'jk/repository-extension'
Prepare for Git on-disk repository representation to undergo backward incompatible changes by introducing a new repository format version "1", with an extension mechanism. * jk/repository-extension: introduce "preciousObjects" repository extension introduce "extensions" form of core.repositoryformatversion
Diffstat (limited to 'builtin/prune.c')
-rw-r--r--builtin/prune.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/prune.c b/builtin/prune.c
index 10b03d3..8f4f052 100644
--- 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++;