diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-24 14:56:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-24 14:56:10 -0700 |
| commit | 26a22d8d00e288dd4825f5d5d77d47473bdf3a6b (patch) | |
| tree | f1866068ea255027cc9cee88673763fffd6b9c90 /builtin | |
| parent | Update draft release notes to 2.2 (diff) | |
| parent | pack-objects: turn off bitmaps when we split packs (diff) | |
| download | tgif-26a22d8d00e288dd4825f5d5d77d47473bdf3a6b.tar.xz | |
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')
| -rw-r--r-- | builtin/pack-objects.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index d39193453a..a4022a78d0 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) { |