From: Eric Sunshine <sunshine@sunshineco.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: "Git List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <l.s.r@web.de>,
"Martin Ågren" <martin.agren@gmail.com>,
"Jeff King" <peff@peff.net>
Subject: Re: [PATCH v3 4/7] grep.c: display column number of first match
Date: Tue, 24 Apr 2018 01:42:24 -0400 [thread overview]
Message-ID: <CAPig+cTPmJW9S-3Mu_4eBkLULNZetd9agjSShf0AMEd+iLbc2w@mail.gmail.com> (raw)
In-Reply-To: <f6f74e43eec63e9e7a9037a2a40075feb5fa0ac4.1524545768.git.me@ttaylorr.com>
On Tue, Apr 24, 2018 at 1:07 AM, Taylor Blau <me@ttaylorr.com> wrote:
> To prepare for 'git grep' learning '--column-number', teach grep.c's
> show_line() how to show the column of the first match on non-context
> line.
>
> Signed-off-by: Taylor Blau <me@ttaylorr.com>
> ---
> diff --git a/grep.c b/grep.c
> @@ -1399,6 +1399,17 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
> + /**
> + * Treat 'cno' as the 1-indexed offset from the start of a non-context
> + * line to its first match. Otherwise, 'cno' is 0 indicating that we are
> + * being called with a context line.
> + */
Nit: Ævar's review[1] mentioned that this project tends to use
/*...*/, not /**...*/.
[1]: https://public-inbox.org/git/874lk2e4he.fsf@evledraar.gmail.com/
> + if (opt->columnnum && cno) {
> + char buf[32];
> + xsnprintf(buf, sizeof(buf), "%d", cno);
> + output_color(opt, buf, strlen(buf), opt->color_columnno);
> + output_sep(opt, sign);
> + }
next prev parent reply other threads:[~2018-04-24 5:42 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1524281843.git.me@ttaylorr.com>
2018-04-21 3:45 ` [PATCH 1/6] grep.c: take regmatch_t as argument in match_line() Taylor Blau
2018-04-22 20:47 ` [PATCH v2 0/6] Teach '--column-number' to 'git-grep(1)' Taylor Blau
2018-04-22 20:47 ` [PATCH v2 1/6] grep.c: take regmatch_t as argument in match_line() Taylor Blau
2018-04-22 23:14 ` Eric Sunshine
2018-04-22 23:30 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 2/6] grep.c: take column number as argument to show_line() Taylor Blau
2018-04-23 0:16 ` Eric Sunshine
2018-04-23 1:17 ` Taylor Blau
2018-04-23 3:30 ` Eric Sunshine
2018-04-23 7:27 ` Ævar Arnfjörð Bjarmason
2018-04-23 7:34 ` Eric Sunshine
2018-04-24 4:27 ` Taylor Blau
2018-04-23 8:01 ` Ævar Arnfjörð Bjarmason
2018-04-24 4:31 ` Taylor Blau
2018-04-24 6:13 ` Junio C Hamano
2018-04-24 18:34 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 3/6] grep.[ch]: teach columnnum, color_columnno to grep_opt Taylor Blau
2018-04-22 21:42 ` Ævar Arnfjörð Bjarmason
2018-04-22 23:24 ` Taylor Blau
2018-04-23 0:21 ` Eric Sunshine
2018-04-23 1:11 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 4/6] grep.c: display column number of first match Taylor Blau
2018-04-23 0:24 ` Eric Sunshine
2018-04-23 1:12 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 5/6] builtin/grep.c: show column numbers via --column-number Taylor Blau
2018-04-22 21:48 ` Ævar Arnfjörð Bjarmason
2018-04-22 23:26 ` Taylor Blau
2018-04-23 0:32 ` Eric Sunshine
2018-04-23 1:14 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 6/6] contrib/git-jump/git-jump: use column number when grep-ing Taylor Blau
2018-04-22 21:49 ` Ævar Arnfjörð Bjarmason
2018-04-22 23:27 ` Taylor Blau
2018-04-22 23:28 ` [PATCH v2 0/6] Teach '--column-number' to 'git-grep(1)' Junio C Hamano
2018-04-22 23:34 ` Taylor Blau
2018-04-23 13:46 ` Junio C Hamano
2018-04-24 5:07 ` [PATCH v3 0/7] " Taylor Blau
2018-04-24 5:07 ` [PATCH v3 1/7] Documentation/config.txt: camel-case lineNumber for consistency Taylor Blau
2018-04-24 5:07 ` [PATCH v3 2/7] grep.c: expose matched column in match_line() Taylor Blau
2018-04-24 5:07 ` [PATCH v3 3/7] grep.[ch]: extend grep_opt to allow showing matched column Taylor Blau
2018-04-24 5:07 ` [PATCH v3 4/7] grep.c: display column number of first match Taylor Blau
2018-04-24 5:42 ` Eric Sunshine [this message]
2018-04-24 5:07 ` [PATCH v3 5/7] builtin/grep.c: add '--column-number' option to 'git-grep(1)' Taylor Blau
2018-04-24 5:07 ` [PATCH v3 6/7] grep.c: add configuration variables to show matched option Taylor Blau
2018-04-24 5:07 ` [PATCH v3 7/7] contrib/git-jump/git-jump: jump to match column in addition to line Taylor Blau
2018-04-24 5:37 ` Eric Sunshine
2018-04-24 18:39 ` Taylor Blau
2018-05-05 2:42 ` [PATCH v4 0/7] Teach '--column' to 'git-grep(1)' Taylor Blau
2018-05-05 2:42 ` [PATCH v4 1/7] Documentation/config.txt: camel-case lineNumber for consistency Taylor Blau
2018-05-05 2:42 ` [PATCH v4 2/7] grep.c: expose matched column in match_line() Taylor Blau
2018-05-08 6:08 ` René Scharfe
2018-05-05 2:42 ` [PATCH v4 3/7] grep.[ch]: extend grep_opt to allow showing matched column Taylor Blau
2018-05-05 2:43 ` [PATCH v4 4/7] grep.c: display column number of first match Taylor Blau
2018-05-05 2:43 ` [PATCH v4 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)' Taylor Blau
2018-05-05 6:15 ` Duy Nguyen
2018-05-07 23:38 ` Taylor Blau
2018-05-06 17:43 ` Phillip Wood
2018-05-06 17:56 ` Ævar Arnfjörð Bjarmason
2018-05-07 23:40 ` Taylor Blau
2018-05-07 14:13 ` Junio C Hamano
2018-05-08 0:08 ` Taylor Blau
2018-05-05 2:43 ` [PATCH v4 6/7] grep.c: add configuration variables to show matched option Taylor Blau
2018-05-05 2:43 ` [PATCH v4 7/7] contrib/git-jump/git-jump: jump to match column in addition to line Taylor Blau
2018-05-06 14:43 ` Martin Ågren
2018-05-06 18:03 ` Ævar Arnfjörð Bjarmason
2018-05-07 23:35 ` Taylor Blau
2018-05-09 2:13 ` [PATCH v5 0/7] Teach '--column' to 'git-grep(1)' Taylor Blau
2018-05-09 2:13 ` [PATCH v5 1/7] Documentation/config.txt: camel-case lineNumber for consistency Taylor Blau
2018-05-09 2:13 ` [PATCH v5 2/7] grep.c: expose matched column in match_line() Taylor Blau
2018-05-09 2:13 ` [PATCH v5 3/7] grep.[ch]: extend grep_opt to allow showing matched column Taylor Blau
2018-05-09 2:13 ` [PATCH v5 4/7] grep.c: display column number of first match Taylor Blau
2018-05-09 2:13 ` [PATCH v5 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)' Taylor Blau
2018-05-09 10:41 ` Phillip Wood
2018-05-09 17:26 ` Martin Ågren
2018-05-09 23:52 ` Taylor Blau
2018-05-10 0:04 ` Junio C Hamano
2018-05-10 5:58 ` René Scharfe
2018-05-10 6:43 ` Junio C Hamano
2018-05-12 3:27 ` Taylor Blau
2018-05-12 5:08 ` Junio C Hamano
2018-05-12 5:19 ` Taylor Blau
2018-05-12 6:07 ` Junio C Hamano
2018-05-18 3:38 ` Taylor Blau
2018-05-18 6:27 ` Junio C Hamano
2018-05-18 21:50 ` Taylor Blau
2018-05-19 4:44 ` Taylor Blau
2018-05-09 23:49 ` Taylor Blau
2018-05-09 16:17 ` Duy Nguyen
2018-05-09 23:48 ` Taylor Blau
2018-05-09 2:13 ` [PATCH v5 6/7] grep.c: add configuration variables to show matched option Taylor Blau
2018-05-09 2:13 ` [PATCH v5 7/7] contrib/git-jump/git-jump: jump to match column in addition to line Taylor Blau
2018-05-12 3:10 ` [PATCH v6 0/7] Teach '--column' to 'git-grep(1)' Taylor Blau
2018-05-12 3:11 ` [PATCH v6 1/7] Documentation/config.txt: camel-case lineNumber for consistency Taylor Blau
2018-05-12 3:11 ` [PATCH v6 2/7] grep.c: expose matched column in match_line() Taylor Blau
2018-05-12 3:11 ` [PATCH v6 3/7] grep.[ch]: extend grep_opt to allow showing matched column Taylor Blau
2018-05-12 3:11 ` [PATCH v6 4/7] grep.c: display column number of first match Taylor Blau
2018-05-12 3:11 ` [PATCH v6 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)' Taylor Blau
2018-05-12 3:11 ` [PATCH v6 6/7] grep.c: add configuration variables to show matched option Taylor Blau
2018-05-12 3:11 ` [PATCH v6 7/7] contrib/git-jump/git-jump: jump to match column in addition to line Taylor Blau
2018-04-21 3:45 ` [PATCH 2/6] grep.c: take column number as argument to show_line() Taylor Blau
2018-04-21 3:45 ` [PATCH 3/6] grep.[ch]: teach columnnum, color_columnno to grep_opt Taylor Blau
2018-04-21 8:32 ` Martin Ågren
2018-04-21 3:45 ` [PATCH 4/6] grep.c: display column number of first match Taylor Blau
2018-04-21 3:45 ` [PATCH 5/6] builtin/grep.c: show column numbers via --column-number Taylor Blau
2018-04-21 4:07 ` Junio C Hamano
2018-04-21 4:14 ` Junio C Hamano
2018-04-21 5:36 ` René Scharfe
2018-04-21 8:39 ` Martin Ågren
2018-04-21 3:45 ` [PATCH 6/6] contrib/git-jump/git-jump: use column number when grep-ing Taylor Blau
2018-06-18 23:43 [PATCH 0/7] grep.c: teach --column to 'git-grep(1)' Taylor Blau
2018-06-22 15:49 ` [PATCH v3 " Taylor Blau
2018-06-22 15:49 ` [PATCH v3 4/7] grep.c: display column number of first match 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=CAPig+cTPmJW9S-3Mu_4eBkLULNZetd9agjSShf0AMEd+iLbc2w@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=martin.agren@gmail.com \
--cc=me@ttaylorr.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).