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 | |
| parent | 19b5d50cb15637f20b9cce01806b3a256491d613 (diff) | |
| parent | 21134714787a02a37da15424d72c0119b2b8ed71 (diff) | |
| download | git-26a22d8d00e288dd4825f5d5d77d47473bdf3a6b.tar.gz | |
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
| -rw-r--r-- | builtin/pack-objects.c | 1 | ||||
| -rwxr-xr-x | t/t5310-pack-bitmaps.sh | 9 |
2 files changed, 10 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) { diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index 0580258c91..6003490192 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -170,4 +170,13 @@ test_expect_success JGIT 'jgit can read our bitmaps' ' ) ' +test_expect_success 'splitting packs does not generate bogus bitmaps' ' + test-genrandom foo $((1024 * 1024)) >rand && + git add rand && + git commit -m "commit with big file" && + git -c pack.packSizeLimit=500k repack -adb && + git init --bare no-bitmaps.git && + git -C no-bitmaps.git fetch .. HEAD +' + test_done |