A subsequent commit will make the quantum of work smaller, necessitating
more locking. This commit allows resolve_delta() to be called outside
the lock.
Signed-off-by: Jonathan Tan <jonathantanmy@xxxxxxxxxx>
---
builtin/index-pack.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index d21353757d..31607a77fc 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -926,7 +926,7 @@ static struct base_data *make_base(struct object_entry *obj,
static struct base_data *resolve_delta(struct object_entry *delta_obj,
struct base_data *base)
{
- void *base_data, *delta_data, *result_data;
+ void *delta_data, *result_data;
struct base_data *result;
unsigned long result_size;
@@ -941,8 +941,8 @@ static struct base_data *resolve_delta(struct object_entry *delta_obj,
obj_stat[i].base_object_no = j;
}
delta_data = get_data_from_pack(delta_obj);
- base_data = get_base_data(base);
- result_data = patch_delta(base_data, base->size,
+ assert(base->data);
+ result_data = patch_delta(base->data, base->size,
delta_data, delta_obj->size, &result_size);
free(delta_data);
if (!result_data)
@@ -1000,6 +1000,7 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base,
base->obj->real_type))
BUG("child->real_type != OBJ_REF_DELTA");
+ get_base_data(base);
result = resolve_delta(child, base);
if (base->ref_first == base->ref_last && base->ofs_last == -1)
free_base_data(base);
@@ -1014,6 +1015,7 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base,
assert(child->real_type == OBJ_OFS_DELTA);
child->real_type = base->obj->real_type;
+ get_base_data(base);
result = resolve_delta(child, base);
if (base->ofs_first == base->ofs_last)
free_base_data(base);
--
2.23.0.866.gb869b98d4c-goog
