From: Marc Branchaud <marcnarc@xiplink.com>
To: git@vger.kernel.org
Cc: Michael Haggerty <mhagger@alum.mit.edu>,
Jeff King <peff@peff.net>, Stefan Beller <sbeller@google.com>
Subject: [PATCH 3/3] diff: enable indent heuristic by default
Date: Fri, 28 Apr 2017 18:33:15 -0400 [thread overview]
Message-ID: <20170428223315.17140-4-marcnarc@xiplink.com> (raw)
In-Reply-To: <20170428223315.17140-1-marcnarc@xiplink.com>
From: Stefan Beller <sbeller@google.com>
The feature was included in v2.11 (released 2016-11-29) and we got no
negative feedback. Quite the opposite, all feedback we got was positive.
Turn it on by default. Users who dislike the feature can turn it off
by setting diff.compactionHeuristic (which includes plumbing commands,
see prior patches).
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
---
diff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index da96577ea..2c47ccb4a 100644
--- a/diff.c
+++ b/diff.c
@@ -27,7 +27,7 @@
#endif
static int diff_detect_rename_default;
-static int diff_indent_heuristic; /* experimental */
+static int diff_indent_heuristic = 1;
static int diff_rename_limit_default = 400;
static int diff_suppress_blank_empty;
static int diff_use_color_default = -1;
--
2.13.0.rc1.15.gf67d331ad
next prev parent reply other threads:[~2017-04-28 22:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 17:21 BUG: diff-{index,files,tree} (and git-gui) do not respect the diff.indentHeuristic config setting Marc Branchaud
2017-04-25 21:27 ` Jeff King
2017-04-27 20:50 ` [PATCH 0/2] Make diff plumbing commands respect the indentHeuristic Marc Branchaud
2017-04-27 20:50 ` [PATCH 1/2] Make the indent heuristic part of diff's basic configuration Marc Branchaud
2017-04-28 7:59 ` Jeff King
2017-04-27 20:50 ` [PATCH 2/2] Have the diff-* builtins configure diff before initializing revisions Marc Branchaud
2017-04-28 8:06 ` Jeff King
2017-05-01 1:01 ` Junio C Hamano
2017-05-01 5:17 ` Jeff King
2017-05-01 5:29 ` Jeff King
2017-04-28 7:56 ` [PATCH 0/2] Make diff plumbing commands respect the indentHeuristic Jeff King
2017-04-28 17:34 ` Stefan Beller
2017-04-28 22:04 ` Jeff King
2017-04-28 22:13 ` Stefan Beller
2017-05-01 10:34 ` Ævar Arnfjörð Bjarmason
2017-05-09 3:16 ` Jeff King
2017-05-09 4:06 ` Junio C Hamano
2017-05-09 7:58 ` Ævar Arnfjörð Bjarmason
2017-05-09 8:04 ` Jeff King
2017-04-28 22:33 ` [PATCHv2 0/3] " Marc Branchaud
2017-04-28 22:33 ` [PATCHv2 1/3] diff: make the indent heuristic part of diff's basic configuration Marc Branchaud
2017-04-28 22:33 ` [PATCHv2 2/3] diff: have the diff-* builtins configure diff before initializing revisions Marc Branchaud
2017-04-28 22:33 ` Marc Branchaud [this message]
2017-04-29 12:40 ` [PATCHv2 0/3] Make diff plumbing commands respect the indentHeuristic Jeff King
2017-04-29 13:14 ` Jeff King
2017-05-01 1:11 ` Junio C Hamano
2017-05-01 5:15 ` Jeff King
2017-05-01 23:25 ` Junio C Hamano
2017-05-01 22:13 ` [PATCHv3 0/4] " Marc Branchaud
2017-05-01 22:13 ` [PATCHv3 1/4] diff: make the indent heuristic part of diff's basic configuration Marc Branchaud
2017-05-01 22:13 ` [PATCHv3 2/4] diff: have the diff-* builtins configure diff before initializing revisions Marc Branchaud
2017-05-01 22:13 ` [PATCHv3 3/4] diff: enable indent heuristic by default Marc Branchaud
2017-05-01 22:20 ` Jeff King
2017-05-01 22:13 ` [PATCHv3 4/4] add--interactive: drop diff.indentHeuristic handling Marc Branchaud
2017-05-01 22:18 ` [PATCHv3 0/4] Make diff plumbing commands respect the indentHeuristic Stefan Beller
2017-04-29 13:15 ` [PATCH 4/3] add--interactive: drop diff.indentHeuristic handling Jeff King
2017-04-30 3:26 ` [PATCHv2 0/3] Make diff plumbing commands respect the indentHeuristic Michael Haggerty
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=20170428223315.17140-4-marcnarc@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=git@vger.kernel.org \
--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).