mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
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
This commit is contained in:
commit
ebc2e5a593
|
@ -812,6 +812,7 @@ static void write_pack_file(void)
|
||||||
fixup_pack_header_footer(fd, sha1, pack_tmp_name,
|
fixup_pack_header_footer(fd, sha1, pack_tmp_name,
|
||||||
nr_written, sha1, offset);
|
nr_written, sha1, offset);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
write_bitmap_index = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!pack_to_stdout) {
|
if (!pack_to_stdout) {
|
||||||
|
|
|
@ -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
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue