[PATCH 6/8] git-repack --max-pack-size: write_one() implements limits
From: Dana How <hidden>
Date: 2016-06-15 22:43:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
If --max-pack-size is specified, generate the appropriate write limit for each object and pass it to write_object(). Detect and return write "failure". Signed-off-by: Dana L. How <redacted> --- builtin-pack-objects.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index d3ebe1d..b50de05 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c@@ -612,11 +612,17 @@ static off_t write_one(struct sha1file *f, return offset; /* if we are deltified, write out base object first. */ - if (e->delta) + if (e->delta) { offset = write_one(f, e->delta, offset); + if (!offset) + return 0; + } e->offset = offset; - size = write_object(f, e, 0); + /* pass in write limit if limited packsize and not first object */ + size = write_object(f, e, pack_size_limit && nr_written ? pack_size_limit - offset : 0); + if (!size) + return e->offset = 0; /* make sure off_t is sufficiently large not to wrap */ if (offset > offset + size)
--
1.5.2.rc0.766.gba60-dirty