diff options
| author | Jeff King <peff@peff.net> | 2014-06-10 16:10:07 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-10 14:01:30 -0700 |
| commit | d078d85bc3cd74bbe1f230feb26cbe28f29d6d25 (patch) | |
| tree | eff04c6c68dde55fe10d197d18a5cf242c8c2472 /builtin | |
| parent | 3198b89fb225ef8e0200e9486a48be8068e85d15 (diff) | |
| download | git-d078d85bc3cd74bbe1f230feb26cbe28f29d6d25.tar.gz | |
repack: s/write_bitmap/&s/ in codejk/repack-pack-keep-objects
The config name is "writeBitmaps", so the internal variable
missing the plural is unnecessarily confusing to write.
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index d6b6bb673b..0ec643f388 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_bitmap = -1; +static int write_bitmaps = -1; static char *packdir, *packtmp; static const char *const git_repack_usage[] = { @@ -29,7 +29,7 @@ static int repack_config(const char *var, const char *value, void *cb) return 0; } if (!strcmp(var, "pack.writebitmaps")) { - write_bitmap = git_config_bool(var, value); + write_bitmaps = git_config_bool(var, value); return 0; } return git_default_config(var, value, cb); @@ -172,7 +172,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) OPT__QUIET(&quiet, N_("be quiet")), OPT_BOOL('l', "local", &local, N_("pass --local to git-pack-objects")), - OPT_BOOL('b', "write-bitmap-index", &write_bitmap, + OPT_BOOL('b', "write-bitmap-index", &write_bitmaps, N_("write bitmap index")), OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"), N_("with -A, do not loosen objects older than this")), @@ -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_bitmap > 0; + pack_kept_objects = write_bitmaps > 0; packdir = mkpathdup("%s/pack", get_object_directory()); packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid()); @@ -221,9 +221,9 @@ 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_bitmap >= 0) + if (write_bitmaps >= 0) argv_array_pushf(&cmd_args, "--%swrite-bitmap-index", - write_bitmap ? "" : "no-"); + write_bitmaps ? "" : "no-"); if (pack_everything & ALL_INTO_ONE) { get_non_kept_pack_filenames(&existing_packs); |