Merge branch 'nd/the-index'

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

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index b815f1c4490ea969194376e976b1f91ca983a71e..ad939d2861554746a9fd52947a38943928ece552 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;
 }