diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:03:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:03:12 -0800 |
| commit | 35cae74c4d38b79ca80f6e62761f64fa67e8e609 (patch) | |
| tree | d6c8286f4dbe8346ab81d4e198b6cf7367b4ee84 /diffcore-pickaxe.c | |
| parent | fd778c09b1bb683d930dae59566bce79be89c628 (diff) | |
| parent | b1c2f57db326c43ec286855b396fb16b4890cf2d (diff) | |
| download | git-35cae74c4d38b79ca80f6e62761f64fa67e8e609.tar.gz | |
Merge branch 'jk/maint-diff-grep-textconv' into maint
"git diff -G<pattern>" did not honor textconv filter when looking
for changes.
* jk/maint-diff-grep-textconv:
diff_grep: use textconv buffers for add/deleted files
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 ed23eb4bdd..a209376354 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -104,10 +104,10 @@ static int diff_grep(struct diff_filepair *p, struct diff_options *o, if (!mf2.ptr) return 0; /* ignore unmerged */ /* created "two" -- does it have what we are looking for? */ - hit = !regexec(regexp, p->two->data, 1, ®match, 0); + hit = !regexec(regexp, mf2.ptr, 1, ®match, 0); } else if (!mf2.ptr) { /* removed "one" -- did it have what we are looking for? */ - hit = !regexec(regexp, p->one->data, 1, ®match, 0); + hit = !regexec(regexp, mf1.ptr, 1, ®match, 0); } else { /* * We have both sides; need to run textual diff and see if |