git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: peff@peff.net, gitster@pobox.com, avarab@gmail.com
Subject: [PATCH v2 0/2] teach --only-matching to 'git-grep(1)'
Date: Mon, 2 Jul 2018 15:08:54 -0500	[thread overview]
Message-ID: <cover.1530562110.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1529961706.git.me@ttaylorr.com>

Hi,

Attached is the second re-roll of my series to teach 'git grep
--only-matching'. Since last time, not much has changed. The change I
did include is summarized below, and an inter-diff is attached as
always.

  - Initialize both match_color and line_color to NULL, thereby
    silencing a compiler warning where match_color was given to
    opt->output_color uninitialized [1].

Thanks in advance for your review :-).


Thanks,
Taylor

[1]: https://public-inbox.org/git/xmqqsh58gp3p.fsf@gitster-ct.c.googlers.com/

Taylor Blau (2):
  grep.c: extract show_line_header()
  grep.c: teach 'git grep --only-matching'

 builtin/grep.c  |  6 ++++
 grep.c          | 91 +++++++++++++++++++++++++++++++------------------
 grep.h          |  1 +
 t/t7810-grep.sh | 15 ++++++++
 4 files changed, 80 insertions(+), 33 deletions(-)

Inter-diff (since v1):

diff --git a/grep.c b/grep.c
index 48cca6723e..49a744f96b 100644
--- a/grep.c
+++ b/grep.c
@@ -1448,7 +1448,8 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
                      const char *name, unsigned lno, ssize_t cno, char sign)
 {
        int rest = eol - bol;
-       const char *match_color, *line_color = NULL;
+       const char *match_color = NULL;
+       const char *line_color = NULL;

        if (opt->file_break && opt->last_shown == 0) {
                if (opt->show_hunk_mark)

--
2.18.0

  parent reply	other threads:[~2018-07-02 20:09 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 ` Taylor Blau [this message]
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 ` [PATCH v3 0/2] grep.c: " Taylor Blau
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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover.1530562110.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).