summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-10 20:40:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-10 20:40:28 (GMT)
commit54c2af5aa3471e3e6de934d411d1bce74eb25960 (patch)
treec8f9e5b4b6c6b0c8126b6d8a0d93ec1648a245cb /builtin/pack-objects.c
parent63a35025b11bf0e7ef39693aeea3b639a066b7b8 (diff)
parent9cea46cdda9359e54aec379c4b4e2f9470c35023 (diff)
downloadgit-54c2af5aa3471e3e6de934d411d1bce74eb25960.zip
git-54c2af5aa3471e3e6de934d411d1bce74eb25960.tar.gz
git-54c2af5aa3471e3e6de934d411d1bce74eb25960.tar.bz2
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/pack-objects.c')
-rw-r--r--builtin/pack-objects.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index d56b2c2..14dccb5 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) {