summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-18 14:40:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-18 14:40:15 -0700
commit989cbd455619e1e7b6156366ee7fd5376af683b6 (patch)
treead99bce7b4e0c380c57eb9a75358bff9a2df559a /builtin
parentMerge branch 'sb/clean-test-fix' into HEAD (diff)
parentpack-objects: warn on split packs disabling bitmaps (diff)
downloadtgif-989cbd455619e1e7b6156366ee7fd5376af683b6.tar.xz
Merge branch 'ew/doc-split-pack-disables-bitmap' into HEAD
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.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a27de5b323..b6664ce4d8 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) {