diff options
| author | David Turner <dturner@twosigma.com> | 2016-12-28 17:45:42 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-29 13:45:37 -0800 |
| commit | 1c409a705cb30ae3db6cdd48757c4a85f51456d4 (patch) | |
| tree | 31094619358b4e3634660cc2c7a7aacc786d27d0 /builtin | |
| parent | bdf56de896b48d6fe3ad90e92138b5fd6579748d (diff) | |
| download | git-1c409a705cb30ae3db6cdd48757c4a85f51456d4.tar.gz git-1c409a705cb30ae3db6cdd48757c4a85f51456d4.tar.xz | |
repack: die on incremental + write-bitmap-index
The bitmap index only works for single packs, so requesting an
incremental repack with bitmap indexes makes no sense.
Signed-off-by: David Turner <dturner@twosigma.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/repack.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index 80dd06b4a..677bc7c81 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -18,6 +18,12 @@ static const char *const git_repack_usage[] = { NULL }; +static const char incremental_bitmap_conflict_error[] = N_( +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +); + + static int repack_config(const char *var, const char *value, void *cb) { if (!strcmp(var, "repack.usedeltabaseoffset")) { @@ -206,6 +212,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix) if (pack_kept_objects < 0) pack_kept_objects = write_bitmaps; + if (write_bitmaps && !(pack_everything & ALL_INTO_ONE)) + die(_(incremental_bitmap_conflict_error)); + packdir = mkpathdup("%s/pack", get_object_directory()); packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid()); |