diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-10-26 23:55:24 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 23:55:25 +0100 |
commit | fa46579555583a9799d8495f632b14cddd65db6e (patch) | |
tree | a2f1155dfc4bd642795ec59e943776ef68e26f67 /builtin/repack.c | |
parent | Merge branch 'dt/t7063-fix-flaky-test' (diff) | |
parent | introduce "preciousObjects" repository extension (diff) | |
download | git-fa46579555583a9799d8495f632b14cddd65db6e.tar.xz git-fa46579555583a9799d8495f632b14cddd65db6e.zip |
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/repack.c')
-rw-r--r-- | builtin/repack.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index 70b9b1eaf1..945611006a 100644 --- 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; |