kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: make !o->detect_rename codepath more obvious 

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.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2018-02-14 10:51:52 -08:00 committed by Junio C Hamano
parent 9622f8af8c
commit e7f04a3aaf
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
merge-recursive.c
View File

@ -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)
{
ri->head_renames = NULL;
ri->merge_renames = NULL;

if (!o->detect_rename)
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);