diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:46:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 13:20:08 -0700 |
| commit | 590f6e4235a7d44ad39511186ca8bbac02ae8c2e (patch) | |
| tree | 6999a9512d87bbc06dfb3308fdc824e5226e7597 /diffcore-pickaxe.c | |
| parent | e13d854322ad802213aea13409505c765b5c68d1 (diff) | |
| parent | 22f698cb188243b313e024d618283e0293e37140 (diff) | |
| download | git-590f6e4235a7d44ad39511186ca8bbac02ae8c2e.tar.xz | |
Sync with 2.6.1
Diffstat (limited to 'diffcore-pickaxe.c')
| -rw-r--r-- | diffcore-pickaxe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 185f86b284..7715c13ec4 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -62,8 +62,8 @@ static int diff_grep(mmfile_t *one, mmfile_t *two, ecbdata.hit = 0; xecfg.ctxlen = o->context; xecfg.interhunkctxlen = o->interhunkcontext; - xdi_diff_outf(one, two, diffgrep_consume, &ecbdata, - &xpp, &xecfg); + if (xdi_diff_outf(one, two, diffgrep_consume, &ecbdata, &xpp, &xecfg)) + return 0; return ecbdata.hit; } |