Re: [RFC PATCH, WAS: "weird diff output?" v2 1/2] xdiff: add recs_match helper function

From: Jacob Keller <jacob.keller@gmail.com>
Date: Apr 15, 2016, 22:48 UTC
Message-ID: <CA+P7+xpbYa993zr_JqrLbnKcKQ-9iwjMD=eLpbLXLBmkDrJ2eQ@mail.gmail.com>
In-Reply-To: <20160415224615.GA32306@sigill.intra.peff.net>

On Fri, Apr 15, 2016 at 3:46 PM, Jeff King <peff@peff.net> wrote:

Show 16 quoted lines

> 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

Oops, I suspect this is a rebase mistake, will fix it.

Thanks, Jake