[PATCH v2 13/14] index-pack: skip looking for ofs-deltas in v4 as they are not allowed
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:58:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- builtin/index-pack.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index e903a49..ce06473 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c@@ -1173,10 +1173,13 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base, find_delta_children(&base_spec, &base->ref_first, &base->ref_last, OBJ_REF_DELTA); - memset(&base_spec, 0, sizeof(base_spec)); - base_spec.offset = base->obj->idx.offset; - find_delta_children(&base_spec, - &base->ofs_first, &base->ofs_last, OBJ_OFS_DELTA); + if (!packv4) { + memset(&base_spec, 0, sizeof(base_spec)); + base_spec.offset = base->obj->idx.offset; + find_delta_children(&base_spec, + &base->ofs_first, &base->ofs_last, + OBJ_OFS_DELTA); + } if (base->ref_last == -1 && base->ofs_last == -1) { free(base->data);
--
1.8.2.83.gc99314b