summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-29 10:35:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-29 10:35:17 -0700
commitebc2e5a593ce7082bed03b2d22e2fe83583a9f5d (patch)
tree2455e6eaba3f324d883ee90069019388e80eb16e /builtin
parentMerge branch 'da/mergetool-meld' into maint (diff)
parentpack-objects: turn off bitmaps when we split packs (diff)
downloadtgif-ebc2e5a593ce7082bed03b2d22e2fe83583a9f5d.tar.xz
Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint
* jk/pack-objects-no-bitmap-when-splitting: pack-objects: turn off bitmaps when we split packs
Diffstat (limited to 'builtin')
-rw-r--r--builtin/pack-objects.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index b59f5d895e..3eb86e0693 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -812,6 +812,7 @@ static void write_pack_file(void)
fixup_pack_header_footer(fd, sha1, pack_tmp_name,
nr_written, sha1, offset);
close(fd);
+ write_bitmap_index = 0;
}
if (!pack_to_stdout) {