| commit | 3992ff0c4caf925373b61aa17ab507207bf7e645 | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 19 Apr 2018 17:58:02 +0000 (19 10:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Apr 2018 01:44:15 +0000 (20 10:44 +0900) | ||
| tree | e222daab27eb19b7b82e89ea72e440652ff34f23 | treesnapshot (tar.gz zip) |
| parent | 9cfee25a823d972250409b5c8bdfd91d1cdf7edb | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |