repack: introduce repack.writeBitmaps config option

We currently have pack.writeBitmaps, which originally
operated at the pack-objects level. This should really have
been a repack.* option from day one. Let's give it the more
sensible name, but keep the old version as a deprecated
synonym.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c0a6e0d05607698e71dd62537eb88fb0f5911475..411bbe5a0dcc5ae2df84ba7df9f3e00752daffb4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1865,12 +1865,7 @@ pack.useBitmaps::
        you are debugging pack bitmaps.
 
 pack.writebitmaps::
        you are debugging pack bitmaps.
 
 pack.writebitmaps::

-       When true, git will write a bitmap index when packing all
-       objects to disk (e.g., when `git repack -a` is run).  This
-       index can speed up the "counting objects" phase of subsequent
-       packs created for clones and fetches, at the cost of some disk
-       space and extra time spent on the initial repack.  Defaults to
-       false.
+       This is a deprecated synonym for `repack.writeBitmaps`.

 
 pack.writeBitmapHashCache::
        When true, git will include a "hash cache" section in the bitmap
 
 pack.writeBitmapHashCache::
        When true, git will include a "hash cache" section in the bitmap


@@ -2133,7 +2128,15 @@ repack.packKeptObjects::
        `--pack-kept-objects` was passed. See linkgit:git-repack[1] for
        details. Defaults to `false` normally, but `true` if a bitmap
        index is being written (either via `--write-bitmap-index` or
        `--pack-kept-objects` was passed. See linkgit:git-repack[1] for
        details. Defaults to `false` normally, but `true` if a bitmap
        index is being written (either via `--write-bitmap-index` or

-       `pack.writeBitmaps`).
+       `repack.writeBitmaps`).
+
+repack.writeBitmaps::
+       When true, git will write a bitmap index when packing all
+       objects to disk (e.g., when `git repack -a` is run).  This
+       index can speed up the "counting objects" phase of subsequent
+       packs created for clones and fetches, at the cost of some disk
+       space and extra time spent on the initial repack.  Defaults to
+       false.

 
 rerere.autoupdate::
        When set to true, `git-rerere` updates the index with the
 
 rerere.autoupdate::
        When set to true, `git-rerere` updates the index with the

diff --git a/builtin/repack.c b/builtin/repack.c
index 634668a7c85ca4b7eb5e87717e7216ba333d4ae7..cd4d4d4273665880fff66029df6419b7493d4e2c 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -28,7 +28,8 @@ static int repack_config(const char *var, const char *value, void *cb)
                pack_kept_objects = git_config_bool(var, value);
                return 0;
        }
                pack_kept_objects = git_config_bool(var, value);
                return 0;
        }

-       if (!strcmp(var, "pack.writebitmaps")) {
+       if (!strcmp(var, "repack.writebitmaps") ||
+           !strcmp(var, "pack.writebitmaps")) {

                write_bitmaps = git_config_bool(var, value);
                return 0;
        }
                write_bitmaps = git_config_bool(var, value);
                return 0;
        }

diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index 685d46f8b75ae105d41e1b462c69f980fe1f61a8..f8ed8573b728e82f7f4afaee677758b736048ebe 100755 (executable)
--- a/t/perf/p5310-pack-bitmaps.sh
+++ b/t/perf/p5310-pack-bitmaps.sh
@@ -8,6 +8,9 @@ test_perf_large_repo
 # note that we do everything through config,
 # since we want to be able to compare bitmap-aware
 # git versus non-bitmap git
 # note that we do everything through config,
 # since we want to be able to compare bitmap-aware
 # git versus non-bitmap git

+#
+# We intentionally use the deprecated pack.writebitmaps
+# config so that we can test against older versions of git.

 test_expect_success 'setup bitmap config' '
        git config pack.writebitmaps true &&
        git config pack.writebitmaphashcache true
 test_expect_success 'setup bitmap config' '
        git config pack.writebitmaps true &&
        git config pack.writebitmaphashcache true

diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index d3a3afaba821f8b70c5f365f1046ba7a707e5085..d81f2c7c725da551ce9897481a800965fca6ce9d 100755 (executable)
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -14,7 +14,7 @@ test_expect_success 'setup repo with moderate-sized history' '
        git checkout master &&
        blob=$(echo tagged-blob | git hash-object -w --stdin) &&
        git tag tagged-blob $blob &&
        git checkout master &&
        blob=$(echo tagged-blob | git hash-object -w --stdin) &&
        git tag tagged-blob $blob &&

-       git config pack.writebitmaps true &&
+       git config repack.writebitmaps true &&

        git config pack.writebitmaphashcache true
 '
 
        git config pack.writebitmaphashcache true
 '
 

diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index e70b98358b02e0d547bb2c7ed5d50b5c5753fee4..28f7135656f51e2e8aea144ff4b68c7945c8cf11 100755 (executable)
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -53,7 +53,7 @@ test_expect_success 'writing bitmaps via command-line can duplicate .keep object
 
 test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
        # build on $objsha1, $packsha1, and .keep state from previous
 
 test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
        # build on $objsha1, $packsha1, and .keep state from previous

-       git -c pack.writebitmaps=true repack -Adl &&
+       git -c repack.writebitmaps=true repack -Adl &&

        test_when_finished "found_duplicate_object=" &&
        for p in .git/objects/pack/*.idx; do
                idx=$(basename $p)
        test_when_finished "found_duplicate_object=" &&
        for p in .git/objects/pack/*.idx; do
                idx=$(basename $p)