From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: Jeff King <peff@peff•net>,
Michael Haggerty <mhagger@alum•mit.edu>,
Jacob Keller <jacob.keller@gmail•com>,
"git\@vger.kernel.org" <git@vger•kernel.org>
Subject: Re: [ANNOUNCE] Git v2.11.0-rc0
Date: Tue, 01 Nov 2016 15:06:17 -0700 [thread overview]
Message-ID: <xmqqr36un9d2.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAGZ79kZHajTxFRbOftH==UAXhbH7RSA_jYWO-aQXhW2aSRdUFA@mail.gmail.com> (Stefan Beller's message of "Tue, 1 Nov 2016 14:41:35 -0700")
Stefan Beller <sbeller@google•com> writes:
>> -diff.indentHeuristic::
>> diff.compactionHeuristic::
>> Set one of these options to `true` to enable one of two
>> experimental heuristics that shift diff hunk boundaries to
>
> We would need to reword this as well, as there will be only one heuristic left?
>> + } else if (flags & XDF_COMPACTION_HEURISTIC) {
>> /*
>> * Indent heuristic: a group of pure add/delete lines
>
> This comment may need adjustment as well (though we could go without)
Thanks. I've queued this as "SQUASH???" on top.
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 0c79e48d9d..39fff3aef9 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -172,9 +172,8 @@ diff.tool::
include::mergetools-diff.txt[]
diff.compactionHeuristic::
- Set one of these options to `true` to enable one of two
- experimental heuristics that shift diff hunk boundaries to
- make patches easier to read.
+ Set this option to `true` to enable experimental heuristics
+ that shift diff hunk boundaries to make patches easier to read.
diff.algorithm::
Choose a diff algorithm. The variants are as follows:
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 6cb96219cb..31ff519232 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -908,7 +908,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
}
} else if (flags & XDF_COMPACTION_HEURISTIC) {
/*
- * Indent heuristic: a group of pure add/delete lines
+ * Heuristic based on the indentation level.
+ *
+ * A group of pure add/delete lines
* implies two splits, one between the end of the "before"
* context and the start of the group, and another between
* the end of the group and the beginning of the "after"
next prev parent reply other threads:[~2016-11-01 22:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 21:49 [ANNOUNCE] Git v2.11.0-rc0 Junio C Hamano
2016-10-31 23:16 ` Simon Ruderich
2016-11-01 9:07 ` Patrick Steinhardt
2016-11-01 20:36 ` Jeff King
2016-11-01 20:56 ` Junio C Hamano
2016-11-01 20:59 ` Jeff King
2016-11-01 21:05 ` Junio C Hamano
2016-11-01 21:38 ` Junio C Hamano
2016-11-01 21:41 ` Stefan Beller
2016-11-01 22:06 ` Junio C Hamano [this message]
2016-11-01 21:45 ` Junio C Hamano
2016-11-01 21:50 ` Jeff King
2016-11-02 21:44 ` Michael Haggerty
2016-11-01 21:10 ` Stefan Beller
2016-11-02 1:21 ` Jacob Keller
2016-11-01 20:43 ` Stefan Beller
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr36un9d2.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jacob.keller@gmail$(echo .)com \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=peff@peff$(echo .)net \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox