diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-08-23 10:17:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 14:30:29 -0700 |
commit | f506b8e8b5fb231e63b69668b6b7516f12b32228 (patch) | |
tree | 02a300dcd882e8ee1d921345250dbe48702da0fe /t/t4252/am-test-1-1 | |
parent | diff: pass the entire diff-options to diffcore_pickaxe() (diff) | |
download | tgif-f506b8e8b5fb231e63b69668b6b7516f12b32228.tar.xz |
git log/diff: add -G<regexp> that greps in the patch text
Teach "-G<regexp>" that is similar to "-S<regexp> --pickaxe-regexp" to the
"git diff" family of commands. This limits the diff queue to filepairs
whose patch text actually has an added or a deleted line that matches the
given regexp. Unlike "-S<regexp>", changing other parts of the line that
has a substring that matches the given regexp IS counted as a change, as
such a change would appear as one deletion followed by one addition in a
patch text.
Unlike -S (pickaxe) that is intended to be used to quickly detect a commit
that changes the number of occurrences of hits between the preimage and
the postimage to serve as a part of larger toolchain, this is meant to be
used as the top-level Porcelain feature.
The implementation unfortunately has to run "diff" twice if you are
running "log" family of commands to produce patches in the final output
(e.g. "git log -p" or "git format-patch"). I think we _could_ cache the
result in-core if we wanted to, but that would require larger surgery to
the diffcore machinery (i.e. adding an extra pointer in the filepair
structure to keep a pointer to a strbuf around, stuff the textual diff to
the strbuf inside diffgrep_consume(), and make use of it in later stages
when it is available) and it may not be worth it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4252/am-test-1-1')
0 files changed, 0 insertions, 0 deletions