Merge branch 'bc/asciidoc-pretty-formats-fix' into maint

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 2c60ddf4a896de034a5d536bba4ef35561de1a61..b59f5d895e38bdb96d19b5fc5061669facdf22cc 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2214,10 +2214,6 @@ static int git_pack_config(const char *k, const char *v, void *cb)
                cache_max_small_delta_size = git_config_int(k, v);
                return 0;
        }
-       if (!strcmp(k, "pack.writebitmaps")) {
-               write_bitmap_index = git_config_bool(k, v);
-               return 0;
-       }
        if (!strcmp(k, "pack.writebitmaphashcache")) {
                if (git_config_bool(k, v))
                        write_bitmap_options |= BITMAP_OPT_HASH_CACHE;