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>

diff --git a/builtin/repack.c b/builtin/repack.c
index d6b6bb673b3ec07351fdf5bd71572030f6fca334..0ec643f38848ad8636372a097560cea3683b07c4 100644 (file)
--- 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 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[] = {
 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")) {
                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);
                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__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")),
                                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)
                                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());
 
        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");
                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",
                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);
 
        if (pack_everything & ALL_INTO_ONE) {
                get_non_kept_pack_filenames(&existing_packs);