From: "Martin Ågren" <martin.agren@gmail.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <l.s.r@web.de>, "Jeff King" <peff@peff.net>
Subject: Re: [PATCH 5/6] builtin/grep.c: show column numbers via --column-number
Date: Sat, 21 Apr 2018 10:39:17 +0200 [thread overview]
Message-ID: <CAN0heSp_bGqKF26g4TDOw6WpsvR2cEW6EqF3aJtKCv5POU_HmQ@mail.gmail.com> (raw)
In-Reply-To: <20180421034540.GF24606@syl.local>
On 21 April 2018 at 05:45, Taylor Blau <me@ttaylorr.com> wrote:
> This commit teaches 'git-grep(1)' a new option, '--column-number'. This
> option builds upon previous commits to show the column number of the
> first match on a non-context line.
>
> For example:
>
> $ git grep -mn example | head -n3
> .clang-format:51:14:# myFunction(foo, bar, baz);
> .clang-format:64:7:# int foo();
> .clang-format:75:8:# void foo()
"example" vs "foo" :-)
> Now that configuration variables such as grep.columnNumber and
> color.grep.columnNumber have a visible effect, we document them in this
> patch as well.
>
> Signed-off-by: Taylor Blau <me@ttaylorr.com>
> ---
One thing I've noted is that your messages are light on the imperative
"do this", preferring "this commit does" or "we do". That said, I found
myself following along quite well in what they're saying.
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1159,6 +1159,8 @@ color.grep.<slot>::
> function name lines (when using `-p`)
> `linenumber`;;
> line number prefix (when using `-n`)
> +`columnnumber`;;
> + column number prefix (when using `-m`)
> `match`;;
> matching text (same as setting `matchContext` and `matchSelected`)
> `matchContext`;;
> @@ -1708,6 +1710,9 @@ gitweb.snapshot::
> grep.lineNumber::
> If set to true, enable `-n` option by default.
>
> +grep.columnNumber::
> + If set to true, enable `-m` option by default.
> +
> grep.patternType::
> Set the default matching behavior. Using a value of 'basic', 'extended',
> 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
You're doing what the immediate neighbours are doing, but the end result
is a bit inconsistent: columnnumber vs columnNumber. I think the ideal
end-game is columnNumber, lineNumber, and so on.
Maybe use "columnNumber" consistently since you're introducing it and
want it to be perfect from the start ;-) and if that leaves "linenumber"
looking too inconsistent, then change it while at it? (I'm not suggesting
changing all foobar to fooBar while at it...)
Martin
next prev parent reply other threads:[~2018-04-21 8:39 UTC|newest]
Thread overview: 108+ 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
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 [this message]
2018-04-21 3:45 ` [PATCH 6/6] contrib/git-jump/git-jump: use column number when grep-ing 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=CAN0heSp_bGqKF26g4TDOw6WpsvR2cEW6EqF3aJtKCv5POU_HmQ@mail.gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--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.
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).