]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9622f8a) | patch
merge-recursive: make !o->detect_rename codepath more obvious
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:51:52 +0000 (10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:02:52 +0000 (13:02 -0800)
commite7f04a3aafe3fa9bc911e3a71e03e9e7cc8b18ba
tree62a7df1fab31b0fcefbad7f1f1c94612504cef69tree | snapshot
parent9622f8af8c337f097661a0f476de5b665d74b853commit | diff
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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.