Re: What's cooking in git.git (May 2017, #03; Wed, 10)

From: Marc Branchaud <marcnarc@xiplink.com>
Date: May 11, 2017, 21:31 UTC
Message-ID: <ac2f1563-735e-9a07-e762-5dda0630304e@xiplink.com>
In-Reply-To: <xmqqinl9xpb8.fsf@gitster.mtv.corp.google.com>

On 2017-05-10 01:18 AM, Junio C Hamano wrote:

Show 9 quoted lines

>
> * mb/diff-default-to-indent-heuristics (2017-05-09) 4 commits
>  - add--interactive: drop diff.indentHeuristic handling
>  - diff: enable indent heuristic by default
>  - diff: have the diff-* builtins configure diff before initializing revisions
>  - diff: make the indent heuristic part of diff's basic configuration
>
>  Make the "indent" heuristics the default in "diff" and diff.indentHeuristics
>  configuration variable an escape hatch for those who do no want it.

Typo fixes:
	s/heuristics/heuristic/  (both places)
	s/do no want/do not want/

>  Kicked out of next; it seems it is still getting review suggestions?

I believe v4 of this one is ready to cook.

The most salient aspect of the review discussion was about where to go after this topic is applied. We also concluded that the topic deserves a release note about breaking patch ID backwards-compatibility. I think such a note should mention rerere, so I would suggest the following:

The diff "indent" heuristic is now enabled by default. This changes the patch IDs calculated by git-patch-id (and used by git-rerere and git-cherry), which could affect workflows that rely on previously-computed patch IDs. The heuristic can be disabled by setting diff.indentHeuristic to false.

M.