Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 7079fab7db808438b8b2bdf79ff693127610dfd3..7234d76f6e7c0ca59964ec06bf3ced7196716749 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1293,7 +1293,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
                max_size = trg_entry->delta_size;
                ref_depth = trg->depth;
        }
-       max_size = max_size * (max_depth - src->depth) /
+       max_size = (uint64_t)max_size * (max_depth - src->depth) /
                                                (max_depth - ref_depth + 1);
        if (max_size == 0)
                return 0;