From: Jeff King <peff@peff.net>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>,
Junio C Hamano <gitster@pobox.com>,
Jens Lehmann <Jens.Lehmann@web.de>,
Davide Libenzi <davidel@xmailserver.org>,
Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [RFC PATCH, WAS: "weird diff output?" v2 1/2] xdiff: add recs_match helper function
Date: Fri, 15 Apr 2016 18:46:15 -0400 [thread overview]
Message-ID: <20160415224615.GA32306@sigill.intra.peff.net> (raw)
In-Reply-To: <20160415215622.6040-2-jacob.e.keller@intel.com>
On Fri, Apr 15, 2016 at 02:56:21PM -0700, Jacob Keller wrote:
> @@ -470,8 +477,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
> * the line next of the current change group, shift forward
> * the group.
> */
> - while (ix < nrec && recs[ixs]->ha == recs[ix]->ha &&
> - xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size, recs[ix]->ptr, recs[ix]->size, flags)) {
> + while (ix < nrec && recs_match(recs, ixs, ix, flags)) {
> + emptylines += is_emptyline(recs[ix]->ptr);
> +
I have not looked closely at your patches yet, but is this hunk right?
The is_emptyline stuff doesn't come in until patch 2.
-Peff
next prev parent reply other threads:[~2016-04-15 22:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-15 21:56 [RFC PATCH, WAS: "weird diff output?" v2 0/2] implement empty line diff chunk heuristic Jacob Keller
2016-04-15 21:56 ` [RFC PATCH, WAS: "weird diff output?" v2 1/2] xdiff: add recs_match helper function Jacob Keller
2016-04-15 22:46 ` Jeff King [this message]
2016-04-15 22:48 ` Jacob Keller
2016-04-15 21:56 ` [RFC PATCH, WAS: "weird diff output?" v2 2/2] xdiff: implement empty line chunk heuristic Jacob Keller
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=20160415224615.GA32306@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Jens.Lehmann@web.de \
--cc=davidel@xmailserver.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.com \
--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.
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).