From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: avarab@gmail.com, peff@peff.net, gitster@pobox.com
Subject: [PATCH 0/2] builtin/grep.c: teach '-o', '--only-matching'
Date: Fri, 4 May 2018 21:03:08 -0700 [thread overview]
Message-ID: <cover.1525492696.git.me@ttaylorr.com> (raw)
Hi,
Attached is a series to teach 'git-grep(1)' how to respond to
'--only-matching' (a-la GNU grep(1)'s --only-matching, including an '-o'
synonym) to only print the matching component(s) of a line. It is based
on v4 of tb/grep-colno, which was sent in [1].
This was suggested to me by Ævar in [2].
This change was fairly straightforward, as Ævar suggests in [3], with
the only complication being that we must print a line header multiple
times when there are >1 matches per-line. This requirement pushes the
implementation towards the extraction of a show_line_header() function,
and some minor changes in show_line() to reflect.
Thank you in advance for your review.
Thanks,
Taylor
[1]: https://public-inbox.org/git/cover.1525488108.git.me@ttaylorr.com
[2]: https://public-inbox.org/git/874lk2e4he.fsf@evledraar.gmail.com
[3]: https://public-inbox.org/git/87in9ucsbb.fsf@evledraar.gmail.com
Taylor Blau (2):
grep.c: extract show_line_header()
builtin/grep.c: teach '-o', '--only-matching' to 'git-grep'
Documentation/git-grep.txt | 6 +++-
builtin/grep.c | 1 +
grep.c | 67 +++++++++++++++++++++++++-------------
grep.h | 1 +
t/t7810-grep.sh | 33 +++++++++++++++++++
5 files changed, 85 insertions(+), 23 deletions(-)
--
2.17.0
next reply other threads:[~2018-05-05 4:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-05 4:03 Taylor Blau [this message]
2018-05-05 4:03 ` [PATCH 1/2] grep.c: extract show_line_header() Taylor Blau
2018-05-05 7:30 ` Eric Sunshine
2018-05-08 0:24 ` Taylor Blau
2018-05-05 4:03 ` [PATCH 2/2] builtin/grep.c: teach '-o', '--only-matching' to 'git-grep' Taylor Blau
2018-05-05 6:49 ` Ævar Arnfjörð Bjarmason
2018-05-08 17:25 ` Jeff King
2018-05-10 2:00 ` Taylor Blau
2018-05-10 6:40 ` Jeff King
2018-05-05 7:36 ` Eric Sunshine
2018-05-08 0:27 ` Taylor Blau
2018-05-12 3:21 ` [PATCH v2 0/2] builtin/grep.c: teach '-o', '--only-matching' Taylor Blau
2018-05-12 3:21 ` [PATCH v2 1/2] grep.c: extract show_line_header() Taylor Blau
2018-05-12 3:21 ` [PATCH v2 2/2] builtin/grep.c: teach '-o', '--only-matching' to 'git-grep' 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.1525492696.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).