Re: [PATCH 5/5] merge-recursive: simplify handle_change_delete

From: Elijah Newren <newren@gmail.com>
Date: May 21, 2018, 17:22 UTC
Message-ID: <CABPp-BFHb+=1tWDH3GsiyYWCcbr83we46stjuU0D_Z_-H=Jx9A@mail.gmail.com>
In-Reply-To: <nycvar.QRO.7.76.6.1805211540120.77@tvgsbejvaqbjf.bet>

Hi Dscho,

On Mon, May 21, 2018 at 6:41 AM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

> On Sat, 19 May 2018, Elijah Newren wrote:
>> On Sat, May 19, 2018 at 12:32 AM, Johannes Sixt <j6t@kdbg.org> wrote:

Show 12 quoted lines

>> >
>> > Oh, there is a reason for the repeated message text: translations! Please do
>> > not play sentence Lego with translated strings. The original code is
>> > preferable.
>>
>> Ah, translations; that makes sense now.  I'm still annoyed by the
>> code, but I retract patch 5 then.
>
> Maybe you can remove the temptation for others, too, my replacing your
> patch 5 with one that adds the code comment "No sentence Lego! Think of
> our poor translators and refrain from making their life miserable!" or
> some more appropriate one?

That sounds reasonable. I'll make that change (plus your other suggested changes on other patches; thanks for all the reviews) in the next round.

I'm also considering adopting a setup_unpack_trees_porcelain() style of handling (from unpack-trees.c) for all these messages in merge-recursive.c, but that's a bigger change that I'd probably put in a separate series if I decide to go with it.

Elijah