repack: s/write_bitmap/&s/ in code
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>
Jeff King committed
Jun 10, 2014 at 16:10 UTC
d078d85bc3cd74bbe1f230feb26cbe28f29d6d25
1 file changed
+6
-6
builtin/repack.c
+6
-6
@@ -10,7 +10,7 @@
10
11
static int delta_base_offset = 1;
12
static int pack_kept_objects = -1;
13
-static int write_bitmap = -1;
13
+static int write_bitmaps = -1;
14
static char *packdir, *packtmp;
15
16
static const char *const git_repack_usage[] = {
@@ -29,7 +29,7 @@ static int repack_config(const char *var, const char *value, void *cb)
29
return 0;
30
}
31
if (!strcmp(var, "pack.writebitmaps")) {
32
- write_bitmap = git_config_bool(var, value);
32
+ write_bitmaps = git_config_bool(var, value);
33
return 0;
34
}
35
return git_default_config(var, value, cb);
@@ -172,7 +172,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
172
OPT__QUIET(&quiet, N_("be quiet")),
173
OPT_BOOL('l', "local", &local,
174
N_("pass --local to git-pack-objects")),
175
- OPT_BOOL('b', "write-bitmap-index", &write_bitmap,
175
+ OPT_BOOL('b', "write-bitmap-index", &write_bitmaps,
176
N_("write bitmap index")),
177
OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"),
178
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)
195
git_repack_usage, 0);
196
197
if (pack_kept_objects < 0)
198
- pack_kept_objects = write_bitmap > 0;
198
+ pack_kept_objects = write_bitmaps > 0;
199
200
packdir = mkpathdup("%s/pack", get_object_directory());
201
packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid());
@@ -221,9 +221,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
221
argv_array_pushf(&cmd_args, "--no-reuse-delta");
222
if (no_reuse_object)
223
argv_array_pushf(&cmd_args, "--no-reuse-object");
224
- if (write_bitmap >= 0)
224
+ if (write_bitmaps >= 0)
225
argv_array_pushf(&cmd_args, "--%swrite-bitmap-index",
226
- write_bitmap ? "" : "no-");
226
+ write_bitmaps ? "" : "no-");
227
228
if (pack_everything & ALL_INTO_ONE) {
229
get_non_kept_pack_filenames(&existing_packs);