mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ew/doc-split-pack-disables-bitmap'

Browse Source 
Doc update.

* ew/doc-split-pack-disables-bitmap:
  pack-objects: warn on split packs disabling bitmaps
This commit is contained in:
Junio C Hamano
2016-05-10 13:40:28 -07:00
parent 63a35025b1 9cea46cdda
commit 54c2af5aa3
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/pack-objects.c
View File

@ -759,6 +759,10 @@ static off_t write_reused_pack(struct sha1file *f)
return reuse_packfile_offset - sizeof(struct pack_header);
}
static const char no_split_warning[] = N_(
"disabling bitmap writing, packs are split due to pack.packSizeLimit"
);
static void write_pack_file(void)
{
uint32_t i = 0, j;
@ -813,7 +817,10 @@ 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 (write_bitmap_index) {
warning(_(no_split_warning));
write_bitmap_index = 0;
}
}
if (!pack_to_stdout) {