]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
merge-recursive: add pointer about unduly complex looking code
authorElijah Newren <newren@gmail.com>
Sun, 10 Jun 2018 04:16:16 +0000 (21:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2018 17:22:57 +0000 (10:22 -0700)
commit5b26c3c941d3c7cd96be668e1778ba22cc4829d5
treeedb65b450540c073dd69e1c33d9cedaf1f576921
parent8ebe7b057ad866e027365526782cd2e42a0bd106
merge-recursive: add pointer about unduly complex looking code

handle_change_delete() has a block of code displaying one of four nearly
identical messages.  Each contains about half a dozen variable
interpolations, which use nearly identical variables as well.  Someone
trying to parse this may be slowed down trying to parse the differences
and why they are here; help them out by adding a comment explaining the
differences.

Further, point out that this code structure isn't collapsed into something
more concise and readable for the programmer, because we want to keep full
messages intact in order to make translators' jobs much easier.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c