summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-24 21:56:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-24 21:56:10 (GMT)
commit26a22d8d00e288dd4825f5d5d77d47473bdf3a6b (patch)
treef1866068ea255027cc9cee88673763fffd6b9c90 /builtin/pack-objects.c
parent19b5d50cb15637f20b9cce01806b3a256491d613 (diff)
parent21134714787a02a37da15424d72c0119b2b8ed71 (diff)
downloadgit-26a22d8d00e288dd4825f5d5d77d47473bdf3a6b.zip
git-26a22d8d00e288dd4825f5d5d77d47473bdf3a6b.tar.gz
git-26a22d8d00e288dd4825f5d5d77d47473bdf3a6b.tar.bz2
Merge branch 'jk/pack-objects-no-bitmap-when-splitting'
Splitting pack-objects output into multiple packs is incompatible with the use of reachability bitmap. * jk/pack-objects-no-bitmap-when-splitting: pack-objects: turn off bitmaps when we split packs
Diffstat (limited to 'builtin/pack-objects.c')
-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 d391934..a4022a7 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -811,6 +811,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) {