From: Elijah Newren <newren@gmail.com>
Date: Wed, 14 Feb 2018 18:51:52 +0000 (-0800)
Subject: merge-recursive: make !o->detect_rename codepath more obvious
X-Git-Tag: v2.18.0-rc0~169^2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7f04a3aafe3fa9bc911e3a71e03e9e7cc8b18ba?hp=e7f04a3aafe3fa9bc911e3a71e03e9e7cc8b18ba

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>
---