On Fri, Apr 15, 2016 at 3:46 PM, Jeff King <peff@xxxxxxxx> wrote: > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html