From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.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, 1 Nov 2016 14:41:35 -0700 [thread overview]
Message-ID: <CAGZ79kZHajTxFRbOftH==UAXhbH7RSA_jYWO-aQXhW2aSRdUFA@mail.gmail.com> (raw)
In-Reply-To: <xmqqzilinanp.fsf@gitster.mtv.corp.google.com>
On Tue, Nov 1, 2016 at 2:38 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> -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?
> --- a/xdiff/xdiffi.c
> +++ b/xdiff/xdiffi.c
> @@ -906,22 +906,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
> if (group_previous(xdfo, &go))
> xdl_bug("group sync broken sliding to match");
> }
> - } else if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {
> - /*
> - * Compaction heuristic: if it is possible to shift the
> - * group to make its bottom line a blank line, do so.
> - *
> - * As we already shifted the group forward as far as
> - * possible in the earlier loop, we only need to handle
> - * backward shifts, not forward ones.
> - */
> - while (!is_blank_line(xdf->recs[g.end - 1], flags)) {
> - if (group_slide_up(xdf, &g, flags))
> - xdl_bug("blank line disappeared");
> - if (group_previous(xdfo, &go))
> - xdl_bug("group sync broken sliding to blank line");
> - }
> - } else if (flags & XDF_INDENT_HEURISTIC) {
> + } 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)
> * implies two splits, one between the end of the "before"
next prev parent reply other threads:[~2016-11-01 21:41 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 [this message]
2016-11-01 22:06 ` Junio C Hamano
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='CAGZ79kZHajTxFRbOftH==UAXhbH7RSA_jYWO-aQXhW2aSRdUFA@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).