From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, jacob.keller@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 0/2 v4] xdiff: implement empty line chunk heuristic
Date: Mon, 18 Apr 2016 14:12:28 -0700 [thread overview]
Message-ID: <1461013950-12503-1-git-send-email-sbeller@google.com> (raw)
> OK, so perhaps either of you two can do a final version people can
> start having fun with?
Here we go. I squashed in your patch, although with a minor change:
- if ((flags & XDF_SHORTEST_LINE_HEURISTIC)) {
+ if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {
We did not need that in the "shortest line" heuristic as we know
a line with the shortest line length must exist. We do not know about
empty lines though.
Thanks,
Stefan
Jacob Keller (1):
xdiff: add recs_match helper function
Stefan Beller (1):
xdiff: implement empty line chunk heuristic
Documentation/diff-config.txt | 5 +++++
Documentation/diff-options.txt | 6 ++++++
diff.c | 11 +++++++++++
xdiff/xdiff.h | 2 ++
xdiff/xdiffi.c | 40 ++++++++++++++++++++++++++++++++++++----
5 files changed, 60 insertions(+), 4 deletions(-)
--
2.8.0.26.gba39a1b.dirty
next reply other threads:[~2016-04-18 21:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-18 21:12 Stefan Beller [this message]
2016-04-18 21:12 ` [PATCH 1/2] xdiff: add recs_match helper function Stefan Beller
2016-04-18 21:12 ` [PATCH 2/2] xdiff: implement empty line chunk heuristic Stefan Beller
2016-04-18 22:04 ` Jacob Keller
2016-04-18 22:24 ` Junio C Hamano
2016-04-19 5:03 ` Jeff King
2016-04-19 6:47 ` Stefan Beller
2016-04-19 7:00 ` Jeff King
2016-04-19 7:05 ` Stefan Beller
2016-04-19 15:17 ` Stefan Beller
2016-04-19 17:06 ` Jeff King
2016-04-19 23:02 ` Jacob Keller
2016-04-19 23:07 ` Junio C Hamano
2016-04-20 13:12 ` Michael S. Tsirkin
2016-04-20 16:09 ` Junio C Hamano
2016-04-20 16:17 ` Jeff King
2016-04-20 6:00 ` Junio C Hamano
2016-04-19 16:51 ` Junio C Hamano
2016-04-18 21:22 ` [PATCH 0/2 v4] " Junio C Hamano
2016-04-18 23:53 ` 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
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=1461013950-12503-1-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.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).