From: Marc Branchaud <marcnarc@xiplink.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>, "Stefan Beller" <sbeller@google.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: What's cooking in git.git (May 2017, #03; Wed, 10)
Date: Thu, 11 May 2017 17:31:45 -0400 [thread overview]
Message-ID: <ac2f1563-735e-9a07-e762-5dda0630304e@xiplink.com> (raw)
In-Reply-To: <xmqqinl9xpb8.fsf@gitster.mtv.corp.google.com>
On 2017-05-10 01:18 AM, Junio C Hamano wrote:
>
> * 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.
next prev parent reply other threads:[~2017-05-11 21:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-10 5:18 What's cooking in git.git (May 2017, #03; Wed, 10) Junio C Hamano
2017-05-10 8:08 ` Ævar Arnfjörð Bjarmason
2017-05-10 9:04 ` Jean-Noël AVILA
2017-05-11 1:12 ` Junio C Hamano
2017-05-11 2:50 ` Junio C Hamano
2017-05-10 8:12 ` Ævar Arnfjörð Bjarmason
2017-05-11 2:19 ` Junio C Hamano
2017-05-11 13:08 ` Johannes Schindelin
2017-05-12 5:29 ` Junio C Hamano
2017-05-11 13:09 ` Johannes Schindelin
2017-05-11 16:35 ` Lars Schneider
2017-05-11 21:31 ` Marc Branchaud [this message]
2017-05-11 23:38 ` Jeff King
2017-05-12 1:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ac2f1563-735e-9a07-e762-5dda0630304e@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).