Re: [PATCH v2 0/7] making log --first-parent imply -m

From: Sergey Organov <sorganov@gmail.com>
Date: Aug 5, 2020, 15:37 UTC
Message-ID: <87k0ydp0hc.fsf@osv.gnss.ru>
In-Reply-To: <20200804195830.GA2014743@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 11 quoted lines

> On Tue, Aug 04, 2020 at 08:50:16PM +0300, Sergey Organov wrote:
>
>> Attached is rather minimal incompatible change to --diff-merges that'd
>> allow extensions in the future, to get out of urge for the discussed
>> changes. I'm going to follow-up with actual improvements and I'm aware
>> it lacks documentation changes.
>
> Thanks, I like the direction here. Definitely it would need
> documentation, but also tests (probably in t4013 alongside the ones my
> series added; in fact you'd probably need to adjust my tests for the
> non-optional argument).

I turned to tests, and found that I have a doubt about the test you've added:

git log --no-diff-merges -p --first-parent master

In modified tests, I'd like to move --no-diff-merges to the end, for the test to be less restrictive:

git log -p --first-parent --no-diff-merges master

It should change nothing for now, but it will allow us in the future to get rid of mutual dependencies between in -m and --first-parent in favor of --first-parent to imply --diff-merges=1. We then will need to override the latter by subsequent --no-diff-merges:

git log -p --first-parent [--diff-merges=1: implied] --no-diff-merges master

In this case your original test:

git log --no-diff-merges -p --first-parent [--diff-merges=1: implied] master

would fail, as implied --diff-merges=1 then wins.

Then I'm going to add a copy:

git log -p --first-parent --diff-merges=off master

to check that this form works as well.

What do you think?

Thanks, -- Sergey