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>,
"Michael Haggerty" <mhagger@alum.mit.edu>
Subject: Enabling the diff "indent" heuristic by default
Date: Mon, 8 May 2017 10:54:10 -0400 [thread overview]
Message-ID: <f867af6f-b601-251a-86a4-ede0bb942efb@xiplink.com> (raw)
In-Reply-To: <xmqqlgq77pse.fsf@gitster.mtv.corp.google.com>
On 2017-05-08 03:48 AM, Junio C Hamano wrote:
>
> * mb/diff-default-to-indent-heuristics (2017-05-02) 4 commits
> (merged to 'next' on 2017-05-08 at 158f401a92)
I think there's a general open question about this, which is whether or
not we should just drop the diff.indentHeuristic configuration setting
altogether.
Peff made the point [0] that if we keep the setting then t4061 should be
rewritten.
My instinct is to keep the setting, at least until the changed default
has a bit of time to settle in. So I'll re-send the topic with the
renovated t4061.
The topic would of course change more drastically if we decide to drop
the setting right away.
> + 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
s/heuristics/heuristic/ (both places)
> configuration variable an escape hatch for those who do no want it.
s/do no/do not/
> Will cook in 'next'.
Both Peff [1] and Ævar [2] mentioned situations where enabling the
heuristic has a small impact on them. If/when this graduates, it's
perhaps worth adding a backward-compatibility note that the default
patch IDs are changing. Maybe something like:
The diff "indent" heuristic is now enabled by default. This changes the
patch IDs calculated by git-patch-id and used by git-cherry, which could
affect patch-based workflows that rely on previously-computed patch IDs.
The heuristic can be disabled by setting diff.indentHeuristic to false.
[0]
https://public-inbox.org/git/20170501222051.svylxazjwnot3wwg@sigill.intra.peff.net/
[1]
https://public-inbox.org/git/20170428220450.olqitnuwhrxzg3pv@sigill.intra.peff.net/
[2]
https://public-inbox.org/git/CACBZZX5f81HKCjRjTDyXzNMVuef9Z_ECS+0SVk2xpbwXudgxCw@mail.gmail.com/
M.
next prev parent reply other threads:[~2017-05-08 14:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-08 7:48 What's cooking in git.git (May 2017, #02; Mon, 8) Junio C Hamano
2017-05-08 14:54 ` Marc Branchaud [this message]
2017-05-08 16:03 ` [PATCH v4 0/4] Make diff plumbing commands respect the indentHeuristic Marc Branchaud
2017-05-08 16:03 ` [PATCH v4 1/4] diff: make the indent heuristic part of diff's basic configuration Marc Branchaud
2017-05-08 16:03 ` [PATCH v4 2/4] diff: have the diff-* builtins configure diff before initializing revisions Marc Branchaud
2017-05-09 3:22 ` Jeff King
2017-05-11 19:22 ` Marc Branchaud
2017-05-08 16:03 ` [PATCH v4 3/4] diff: enable indent heuristic by default Marc Branchaud
2017-05-08 16:03 ` [PATCH v4 4/4] add--interactive: drop diff.indentHeuristic handling Marc Branchaud
2017-05-09 3:29 ` Jeff King
2017-05-08 17:13 ` [PATCH v4 0/4] Make diff plumbing commands respect the indentHeuristic Stefan Beller
2017-05-09 3:27 ` Jeff King
2017-05-09 3:32 ` Jeff King
2017-05-09 3:20 ` Enabling the diff "indent" heuristic by default Jeff King
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=f867af6f-b601-251a-86a4-ede0bb942efb@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--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).