diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:33:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:33:56 -0700 |
| commit | 11a458befcd7662fbe6d2d53c76d49ae2b0fe219 (patch) | |
| tree | de4cf6a8a43cb30b53f924ed8820de09409f0afd /diffcore-pickaxe.c | |
| parent | ee6ad5f4d56e697c972af86cbefdf269b386e470 (diff) | |
| parent | a2558fb8e1e387b630312311e1d22c95663da5d0 (diff) | |
| download | git-11a458befcd7662fbe6d2d53c76d49ae2b0fe219.tar.xz | |
Sync with 2.4.10
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; } |