diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 23:32:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 23:32:25 (GMT) |
| commit | f89baca1b99ff2882690d6b58dc2071195c6ae84 (patch) | |
| tree | 2901be0d9c8d2b46710fe97681b66b116127fd96 /builtin/prune.c | |
| parent | b05c2f9ed48adfd9670b28ecdd5c55a4e4698704 (diff) | |
| parent | 067fbd4105c5aa8260a73cc6961854be0e93fa03 (diff) | |
| download | git-f89baca1b99ff2882690d6b58dc2071195c6ae84.zip git-f89baca1b99ff2882690d6b58dc2071195c6ae84.tar.gz git-f89baca1b99ff2882690d6b58dc2071195c6ae84.tar.bz2 | |
Merge branch 'jk/repository-extension' into maint
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.c | 3 |
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++; |