[PATCH v2 18/33] merge-recursive: make !o->detect_rename codepath more obvious
From: Elijah Newren <hidden>
Date: 2017-11-20 22:02:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
Previously, if !o->detect_rename then get_renames() would return an empty string_list, and then process_renames() would have nothing to iterate over. It seems more straightforward to simply avoid calling either function in that case. Signed-off-by: Elijah Newren <redacted> --- merge-recursive.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index db8590ab1a..be04e61c10 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -1329,8 +1329,6 @@ static struct string_list *get_renames(struct merge_options *o, struct diff_options opts; renames = xcalloc(1, sizeof(struct string_list)); - if (!o->detect_rename) - return renames; diff_setup(&opts); opts.flags.recursive = 1;
@@ -1648,6 +1646,12 @@ static int handle_renames(struct merge_options *o, struct string_list *entries, struct rename_info *ri) { + if (!o->detect_rename) { + ri->head_renames = NULL; + ri->merge_renames = NULL; + return 1; + } + ri->head_renames = get_renames(o, head, common, head, merge, entries); ri->merge_renames = get_renames(o, merge, common, head, merge, entries); return process_renames(o, ri->head_renames, ri->merge_renames);
@@ -1658,6 +1662,9 @@ static void cleanup_rename(struct string_list *rename) const struct rename *re; int i; + if (rename == NULL) + return; + for (i = 0; i < rename->nr; i++) { re = rename->items[i].util; diff_free_filepair(re->pair);
--
2.15.0.309.g00c152f825