diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 10:51:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 13:02:52 -0800 |
| commit | e7f04a3aafe3fa9bc911e3a71e03e9e7cc8b18ba (patch) | |
| tree | 62a7df1fab31b0fcefbad7f1f1c94612504cef69 /commit.c | |
| parent | merge-recursive: fix leaks of allocated renames and diff_filepairs (diff) | |
| download | git-e7f04a3aafe3fa9bc911e3a71e03e9e7cc8b18ba.tar.gz git-e7f04a3aafe3fa9bc911e3a71e03e9e7cc8b18ba.zip | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions