diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-10 13:40:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-10 13:40:28 -0700 |
| commit | 54c2af5aa3471e3e6de934d411d1bce74eb25960 (patch) | |
| tree | c8f9e5b4b6c6b0c8126b6d8a0d93ec1648a245cb /builtin | |
| parent | Sync with maint (diff) | |
| parent | pack-objects: warn on split packs disabling bitmaps (diff) | |
| download | tgif-54c2af5aa3471e3e6de934d411d1bce74eb25960.tar.xz | |
Merge branch 'ew/doc-split-pack-disables-bitmap'
Doc update.
* ew/doc-split-pack-disables-bitmap:
pack-objects: warn on split packs disabling bitmaps
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pack-objects.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index d56b2c2d1e..14dccb5283 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -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) { |