diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:16:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:16:54 -0700 |
| commit | 3adc4ec7b9e1d2118501728a75a5b93d971974fa (patch) | |
| tree | 807d65746060e9967d6d016b230730ef5fd24334 /diffcore-pickaxe.c | |
| parent | be08dee9738eaaa0423885ed189c2b6ad8368cf0 (diff) | |
| parent | 24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff) | |
| download | git-3adc4ec7b9e1d2118501728a75a5b93d971974fa.tar.xz | |
Sync with v2.5.4
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; } |