diff options
| author |  Jeff King <peff@peff.net> | 2014-06-10 16:19:38 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-06-10 14:04:06 -0700 |
| commit | 2bed2d47b4394bd6d4ae4645be9f7424009d3c9c (patch) | |
| tree | c412afd638c4c3a02882b7bad3dff0f121d23403 /builtin | |
| parent | pack-objects: stop respecting pack.writebitmaps (diff) | |
| download | tgif-2bed2d47b4394bd6d4ae4645be9f7424009d3c9c.tar.xz | |
repack: simplify handling of --write-bitmap-index
We previously needed to pass --no-write-bitmap-index
explicitly to pack-objects to override its reading of
pack.writebitmaps from the config. Now that it no longer
does so, we can assume that bitmaps are off by default, and
only turn them on when necessary. This also lets us avoid a
confusing tri-state flag for write_bitmaps.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/repack.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index 0ec643f388..634668a7c8 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -10,7 +10,7 @@ static int delta_base_offset = 1; static int pack_kept_objects = -1; -static int write_bitmaps = -1; +static int write_bitmaps; static char *packdir, *packtmp; static const char *const git_repack_usage[] = { @@ -195,7 +195,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) git_repack_usage, 0); if (pack_kept_objects < 0) - pack_kept_objects = write_bitmaps > 0; + pack_kept_objects = write_bitmaps; packdir = mkpathdup("%s/pack", get_object_directory()); packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid()); @@ -221,9 +221,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix) argv_array_pushf(&cmd_args, "--no-reuse-delta"); if (no_reuse_object) argv_array_pushf(&cmd_args, "--no-reuse-object"); - if (write_bitmaps >= 0) - argv_array_pushf(&cmd_args, "--%swrite-bitmap-index", - write_bitmaps ? "" : "no-"); + if (write_bitmaps) + argv_array_push(&cmd_args, "--write-bitmap-index"); if (pack_everything & ALL_INTO_ONE) { get_non_kept_pack_filenames(&existing_packs); |