Re: What's cooking in git.git (Aug 2020, #02; Mon, 10)

[Sergey Organov <sorganov@gmail.com>]

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

> Sergey Organov <sorganov@gmail.com> writes:
>
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>> [...]
>>
>>> * jk/log-fp-implies-m (2020-07-29) 7 commits
>>>   (merged to 'next' on 2020-08-03 at 39fefa6b82)
>>>  + doc/git-log: clarify handling of merge commit diffs
>>>  + doc/git-log: move "-t" into diff-options list
>>>  + doc/git-log: drop "-r" diff option
>>>  + doc/git-log: move "Diff Formatting" from rev-list-options
>>>  + log: enable "-m" automatically with "--first-parent"
>>>  + revision: add "--no-diff-merges" option to counteract "-m"
>>>  + log: drop "--cc implies -m" logic
>>>
>>>  Originally merged to 'next' on 2020-08-01
>>>
>>>  "git log --first-parent -p" showed patches only for single-parent
>>>  commits on the first-parent chain; the "--first-parent" option has
>>>  been made to imply "-m".  Use "--no-diff-merges" to restore the
>>>  previous behaviour to omit patches for merge commits.
>>>
>>>  On hold a bit.
>>>  cf. <20200804200018.GB2014743@coredump.intra.peff.net>
>>
>> I believe I've submitted resolution for that.
>>
>> <20200805220832.3800-1-sorganov@gmail.com>
>>
>> Do you expect anything from me to push all this further?
>
> I was waiting for a reroll of the "resolution" with just one extra
> test I mentioned in <xmqq3650n2rc.fsf@gitster.c.googlers.com> in the
> thread.  With that everything would be good to go, I would think.

And I asked you to postpone that in <875z9v7b0k.fsf@osv.gnss.ru> for
which I got no answer. I repeat it here for convenience:

"
For now, can we leave these patches as-is and then add additional tests
on top, please? I'm afraid that adding them now will force me to rewrite
current descriptions, as the result won't be minimal anymore, and I
feel uneasy about writing commit messages for these permuted tests
anyway.
"

Thanks,
-- Sergey