Hi,
Attached here is a third re-roll of my series to teach 'git grep
--only-matching'. (I didn't mention it in the thread, but I _thought_
that twice would be enough, so I think Peff's advice about not counting
on anything being the final re-roll of something applies to my thoughts,
too ;-) ).
Since last time:
- The second patch has been amended to include the full invocation of
'git grep' (including `--column`, `--only-matching`, and
`--line-number`) [1].
- The second patch has been also amended to add the new option
(`--only-matching`) to Documentation/git-grep.txt per [2].
An inter-diff is available below, and thanks as always for your review
:-).
Thanks,
Taylor
[1]: https://public-inbox.org/git/20180703143820.gc23...@sigill.intra.peff.net/
[2]: https://public-inbox.org/git/xmqq1sckoxk8....@gitster-ct.c.googlers.com/
Taylor Blau (2):
grep.c: extract show_line_header()
grep.c: teach 'git grep --only-matching'
Documentation/git-grep.txt | 6 ++-
builtin/grep.c | 6 +++
grep.c | 91 ++++++++++++++++++++++++--------------
grep.h | 1 +
t/t7810-grep.sh | 15 +++++++
5 files changed, 85 insertions(+), 34 deletions(-)
Inter-diff (since v2):
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 0de3493b80..be13fc3253 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -17,7 +17,7 @@ SYNOPSIS
[-l | --files-with-matches] [-L | --files-without-match]
[(-O | --open-files-in-pager) [<pager>]]
[-z | --null]
- [-c | --count] [--all-match] [-q | --quiet]
+ [ -o | --only-matching ] [-c | --count] [--all-match] [-q | --quiet]
[--max-depth <depth>]
[--color[=<when>] | --no-color]
[--break] [--heading] [-p | --show-function]
@@ -201,6 +201,10 @@ providing this option will cause it to die.
Output \0 instead of the character that normally follows a
file name.
+-o::
+--only-matching::
+ Output only the matching part of the lines.
+
-c::
--count::
Instead of showing every matched line, show the number of
--
2.18.0
