Re: [PATCH 1/3] diff-merges: cleanup func_by_opt()

From: Sergey Organov <sorganov@gmail.com>
Date: Sep 16, 2022, 13:01 UTC
Message-ID: <87wna3jwx8.fsf@osv.gnss.ru>
In-Reply-To: <xmqqfsgsmq4j.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

Show 8 quoted lines

> Sergey Organov <sorganov@gmail.com> writes:
>
>> Get rid of unneeded "else" statements in func_by_opt().
>
> While it is true that loss of "else" will not change what the code
> means, this change feels subjective and I'd say it falls into "once
> committed, it is not worth the patch noise to go in and change"
> category, not a "clean-up we should do".

I agree the "else" vs "no else" is subjective, but the problem in fact is that the first "if", unlike the rest of them, already had no "else", making the code inconsistent. So the fix should either be adding one "else" to the first "if", or remove all of the "else". I chose the latter, to end up with less noisy code.

Show 5 quoted lines

>
> I haven't looked at diff-merges.c for quite a while, but I did.  I
> notice that the code is barely commented on what each helper
> function is supposed to do, etc., and very hard to follow.  The file
> needs cleaning up in that area a lot more, I would say.

I believe each helper function does exactly what its name suggests, so no comments are needed. I hate to add comments that actually just say the same as function name, so I'd rathe consider to rename some functions instead should somebody point out to problematic ones.

That said, it seems Elijah Newren had not much trouble adding his --remerge-diff capability to the diff-merges code, so the code must be not that hard to follow even in its current state.

Thanks, -- Sergey Organov.