[PATCH 1/2] index_pack: indent find_unresolved_detals one level
From: <hidden>
Date: 2016-06-15 22:52:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/2] index_pack: indent find_unresolved_detals one level · Junio C Hamano <hidden>
From: Nguyễn Thái Ngọc Duy <redacted> The next patch puts most of the code in one level deeper. By indenting separately, it'd be easier to see the actual changes. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/index-pack.c | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 103e19c..9855ada 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c@@ -585,37 +585,36 @@ static void find_unresolved_deltas(struct base_data *base, base_spec.offset = base->obj->idx.offset; find_delta_children(&base_spec, &ofs_first, &ofs_last, OBJ_OFS_DELTA); - } - if (ref_last == -1 && ofs_last == -1) { - free(base->data); - return; - } + if (ref_last == -1 && ofs_last == -1) { + free(base->data); + return; + } - link_base_data(prev_base, base); + link_base_data(prev_base, base); - for (i = ref_first; i <= ref_last; i++) { - struct object_entry *child = objects + deltas[i].obj_no; - struct base_data result; + for (i = ref_first; i <= ref_last; i++) { + struct object_entry *child = objects + deltas[i].obj_no; + struct base_data result; - assert(child->real_type == OBJ_REF_DELTA); - resolve_delta(child, base, &result); - if (i == ref_last && ofs_last == -1) - free_base_data(base); - find_unresolved_deltas(&result, base); - } + assert(child->real_type == OBJ_REF_DELTA); + resolve_delta(child, base, &result); + if (i == ref_last && ofs_last == -1) + free_base_data(base); + find_unresolved_deltas(&result, base); + } - for (i = ofs_first; i <= ofs_last; i++) { - struct object_entry *child = objects + deltas[i].obj_no; - struct base_data result; + for (i = ofs_first; i <= ofs_last; i++) { + struct object_entry *child = objects + deltas[i].obj_no; + struct base_data result; - assert(child->real_type == OBJ_OFS_DELTA); - resolve_delta(child, base, &result); - if (i == ofs_last) - free_base_data(base); - find_unresolved_deltas(&result, base); + assert(child->real_type == OBJ_OFS_DELTA); + resolve_delta(child, base, &result); + if (i == ofs_last) + free_base_data(base); + find_unresolved_deltas(&result, base); + } } - unlink_base_data(base); }
--
1.7.8.36.g69ee2