From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: peff@peff.net, gitster@pobox.com, avarab@gmail.com
Subject: [PATCH v3 0/2] grep.c: teach --only-matching to 'git-grep(1)'
Date: Tue, 3 Jul 2018 16:51:52 -0500 [thread overview]
Message-ID: <cover.1530654455.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1529961706.git.me@ttaylorr.com>
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.GC23556@sigill.intra.peff.net/
[2]: https://public-inbox.org/git/xmqq1sckoxk8.fsf@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
next prev parent reply other threads:[~2018-07-03 21:52 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 21:25 [PATCH 0/2] grep.c: teach --only-matching to 'git-grep(1)' Taylor Blau
2018-06-25 21:25 ` [PATCH 1/2] grep.c: extract show_line_header() Taylor Blau
2018-06-25 21:26 ` [PATCH 2/2] grep.c: teach 'git grep --only-matching' Taylor Blau
2018-06-27 16:40 ` Junio C Hamano
2018-06-27 17:16 ` Taylor Blau
2018-06-27 21:11 ` Junio C Hamano
2018-06-27 21:22 ` Taylor Blau
2018-06-28 18:32 ` Jeff King
2018-07-02 20:08 ` [PATCH v2 0/2] teach --only-matching to 'git-grep(1)' Taylor Blau
2018-07-02 20:08 ` [PATCH v2 1/2] grep.c: extract show_line_header() Taylor Blau
2018-07-02 20:09 ` [PATCH v2 2/2] grep.c: teach 'git grep --only-matching' Taylor Blau
2018-07-03 14:37 ` [PATCH v2 0/2] teach --only-matching to 'git-grep(1)' Jeff King
2018-07-03 14:38 ` Jeff King
2018-07-03 20:48 ` Junio C Hamano
2018-07-03 21:51 ` Taylor Blau [this message]
2018-07-03 21:51 ` [PATCH v3 1/2] grep.c: extract show_line_header() Taylor Blau
2018-07-03 21:52 ` [PATCH v3 2/2] grep.c: teach 'git grep --only-matching' Taylor Blau
2018-07-04 14:53 ` [PATCH v2] " Taylor Blau
2018-07-04 14:55 ` Taylor Blau
2018-07-06 18:17 ` Junio C Hamano
2018-07-05 14:21 ` [PATCH v3 0/2] grep.c: teach --only-matching to 'git-grep(1)' Jeff King
2018-07-05 14:34 ` Taylor Blau
2018-07-06 18:21 ` Junio C Hamano
2018-07-06 20:15 ` Taylor Blau
2018-07-06 20:33 ` Jeff King
2018-07-06 21:44 ` Junio C Hamano
2018-07-09 20:33 ` [PATCH v4] grep.c: teach 'git grep --only-matching' Taylor Blau
2018-07-09 20:36 ` Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1530654455.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).