Re: What's cooking in git.git (Apr 2021, #04; Thu, 15)

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 18, 2021, 19:09 UTC
Message-ID: <xmqqtuo39zqk.fsf@gitster.g>
In-Reply-To: <87zgxvttvx.fsf@osv.gnss.ru>

Sergey Organov <sorganov@gmail.com> writes:

Show 21 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
>
>
> [...]
>
>>
>> * so/log-diff-merge (2021-04-13) 5 commits
>>  - doc/diff-options: document new --diff-merges features
>>  - diff-merges: introduce log.diffMerges config variable
>>  - diff-merges: adapt -m to enable default diff format
>>  - diff-merges: refactor set_diff_merges()
>>  - diff-merges: introduce --diff-merges=on
>>
>>  "git log" learned "--diff-merges=<style>" option, with an
>>  associated configuration variable log.diffMerges.
>>
>>  Seems to break t9902.
>
> As far as I understand, it doesn't. It rather hits a deficiency of the
> build system where one needs to "make install" for completion tests to
> run as expected.

Yeah, the next issue of the report will show that this topic has been moved on top of fix for config-list.h dependency in the build procedure, which fixed the issue.

Thanks.