diff options
| author | Nicolas Pitre <nico@cam.org> | 2008-11-12 18:23:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 22:55:03 (GMT) |
| commit | a1e4760fcfece8eb9b556f35a04a521fdee3963c (patch) | |
| tree | 4923753aaa855dedfab330b250856b99cca5cea2 /builtin-pack-objects.c | |
| parent | fa7b3c2f752a10a5dca9989d4a1c4b93ffa7f943 (diff) | |
| download | git-a1e4760fcfece8eb9b556f35a04a521fdee3963c.zip git-a1e4760fcfece8eb9b556f35a04a521fdee3963c.tar.gz git-a1e4760fcfece8eb9b556f35a04a521fdee3963c.tar.bz2 | |
Fix pack.packSizeLimit and --max-pack-size handling
If the limit was sufficiently low, having a single object written
could bust the limit (by design), but caused the remaining allowed
size to go negative for subsequent objects, which for an unsigned
variable is a rather huge limit.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index b0dddbe..8fe5124 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -245,8 +245,16 @@ static unsigned long write_object(struct sha1file *f, type = entry->type; /* write limit if limited packsize and not first object */ - limit = pack_size_limit && nr_written ? - pack_size_limit - write_offset : 0; + if (!pack_size_limit || !nr_written) + limit = 0; + else if (pack_size_limit <= write_offset) + /* + * the earlier object did not fit the limit; avoid + * mistaking this with unlimited (i.e. limit = 0). + */ + limit = 1; + else + limit = pack_size_limit - write_offset; if (!entry->delta) usable_delta = 0; /* no delta */ |