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

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 238b5021eb105007a42061d5f8febc455530da45..b59f5d895e38bdb96d19b5fc5061669facdf22cc 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2494,6 +2494,7 @@ static void get_object_list(int ac, const char **av)
                                if (get_sha1_hex(line + 10, sha1))
                                        die("not an SHA-1 '%s'", line + 10);
                                register_shallow(sha1);
+                               use_bitmap_index = 0;
                                continue;
                        }
                        die("not a rev '%s'", line);