Merge branch 'master' of github.com:linusboyle/git

[thirdparty/git.git] / diffcore-pickaxe.c

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index d2361e06a1e45a1bdb94d6f5d6d2c003ac587e30..69fc55ea1e34af69b7ed4d57e521cb4825f99fd2 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -62,7 +62,8 @@ static int diff_grep(mmfile_t *one, mmfile_t *two,
        ecbdata.hit = 0;
        xecfg.ctxlen = o->context;
        xecfg.interhunkctxlen = o->interhunkcontext;
-       if (xdi_diff_outf(one, two, diffgrep_consume, &ecbdata, &xpp, &xecfg))
+       if (xdi_diff_outf(one, two, discard_hunk_line, diffgrep_consume,
+                         &ecbdata, &xpp, &xecfg))
                return 0;
        return ecbdata.hit;
 }