Re: [PATCH v5 1/3] builtin/config: introduce `--default`

2018-04-06 Thread Taylor Blau
On Fri, Apr 06, 2018 at 03:40:56AM -0400, Eric Sunshine wrote: > On Fri, Apr 6, 2018 at 2:53 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > > On Fri, Apr 6, 2018 at 2:30 AM, Taylor Blau <m...@ttaylorr.com> wrote: > >> +test_expect_success 'uses entry when avai

Re: [PATCH v5 2/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-06 Thread Taylor Blau
On Fri, Apr 06, 2018 at 10:55:18AM -0400, Jeff King wrote: > On Fri, Apr 06, 2018 at 02:14:34AM -0400, Eric Sunshine wrote: > > > > diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt > > > @@ -9,13 +9,13 @@ git-config - Get and set repository or global options > > > SYNOPSIS

Re: [PATCH v4 2/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-05 Thread Taylor Blau
On Thu, Apr 05, 2018 at 06:40:51PM -0400, Jeff King wrote: > On Thu, Apr 05, 2018 at 06:29:18PM -0400, Eric Sunshine wrote: > > > > +ensure that the variable(s) are of the given type and convert the value > > > to the > > > +canonical form. If no type specifier is passed, no checks or > > >

Re: [PATCH v4 2/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-05 Thread Taylor Blau
On Thu, Apr 05, 2018 at 06:29:18PM -0400, Eric Sunshine wrote: > On Wed, Apr 4, 2018 at 10:00 PM, Taylor Blau <m...@ttaylorr.com> wrote: > > [...] > > In this patch, we prefer `--type=[int|bool|bool-or-int|...]` over > > `--int`, `--bool`, and etc. This allows the aforem

[PATCH v5 2/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-05 Thread Taylor Blau
upcoming patch to support querying a color value with a default via `--type=color --default=`, without squandering `--color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 74 builtin/config.c | 28 ++

[PATCH v5 1/2] builtin/config.c: treat type specifiers singularly

2018-04-05 Thread Taylor Blau
future patch will introduce `--type=`, and we would like not to complain in the following situation: $ git config --int --type=int Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- builtin/config.c | 49 +++--- t/t1300-repo-config.sh | 11 ++ 2

[PATCH v5 0/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-05 Thread Taylor Blau
ation, "input output" (cc: Peff). Thanks as always for your feedback -- I look forward to having this queued. Thanks, Taylor Taylor Blau (2): builtin/config.c: treat type specifiers singularly builtin/config.c: prefer `--type=bool` over `--bool`, etc. Documentation/git-config.txt | 74

[PATCH v5 0/2] *** SUBJECT HERE ***

2018-04-05 Thread Taylor Blau
*** BLURB HERE *** Taylor Blau (2): builtin/config.c: treat type specifiers singularly builtin/config.c: prefer `--type=bool` over `--bool`, etc. Documentation/git-config.txt | 74 +++--- builtin/config.c | 77 +++- t

[PATCH v5 3/3] builtin/config: introduce `color` type specifier

2018-04-06 Thread Taylor Blau
-get-color` alone. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 7 +++ builtin/config.c | 22 ++ t/t1300-repo-config.sh | 30 ++ 3 files changed, 59 insertions(+) diff --git a/D

Re: [PATCH v4 3/3] builtin/config: introduce `color` type specifier

2018-04-06 Thread Taylor Blau
On Thu, Apr 05, 2018 at 06:36:20PM -0400, Jeff King wrote: > On Wed, Apr 04, 2018 at 07:59:17PM -0700, Taylor Blau wrote: > > > As of this commit, the canonical way to retreive an ANSI-compatible > > color escape sequence from a configuration file is with the > &

[PATCH v6 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-06 Thread Taylor Blau
/#mab6aee239c023445fd72693728b566cad5e0fc66 Taylor Blau (2): builtin/config.c: treat type specifiers singularly builtin/config.c: support `--type=` as preferred alias for `--type` Documentation/git-config.txt | 73 +++--- builtin/config.c | 76

Re: [PATCH v4 1/3] builtin/config: introduce `--default`

2018-04-05 Thread Taylor Blau
On Thu, Apr 05, 2018 at 06:40:03PM -0400, Eric Sunshine wrote: > On Wed, Apr 4, 2018 at 10:59 PM, Taylor Blau <m...@ttaylorr.com> wrote: > > [...] > > This commit (and those following it in this series) aim to eventually > > replace `--get-color` with a consistent

[PATCH v5 0/3] builtin/config: introduce `--default`

2018-04-06 Thread Taylor Blau
Peff). - Add notes to Documentation stating when we do and do not sanitize values into a ".gitconfig". (cc: Peff). - Remove a hunk left over during rebasing (cc: Peff). - Replace one last outdated reference to "--color" (cc: Peff). Thanks as always for your r

[PATCH v5 1/3] builtin/config: introduce `--default`

2018-04-06 Thread Taylor Blau
tion with `--default`) will be sufficient to replace `--get-color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 4 builtin/config.c | 19 ++ t/t1310-config-default.sh| 38 3 files changed, 61

[PATCH v5 2/3] config.c: introduce 'git_config_color' to parse ANSI colors

2018-04-06 Thread Taylor Blau
In preparation for adding `--type=color` to the `git-config(1)` builtin, let's introduce a color parsing utility, `git_config_color` in a similar fashion to `git_config_`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- config.c | 10 ++ config.h | 1 + 2 files changed, 11 inse

Re: [PATCH v4 2/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-05 Thread Taylor Blau
On Thu, Apr 05, 2018 at 06:12:02PM -0400, Jeff King wrote: > On Wed, Apr 04, 2018 at 07:02:38PM -0700, Taylor Blau wrote: > > > +test_expect_success '--no-type unsets type specifiers' ' > > + echo "10" > expect && > > + git config --type=bool --no

Re: [PATCH v5 0/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-05 Thread Taylor Blau
On Thu, Apr 05, 2018 at 10:29:01PM -0700, Taylor Blau wrote: > Hi, Ack. Clearly I am still getting used to things outside of Git LFS. I have sent this topic in response to my series to add "--default" instead of the appropriate series. I'll avoid re-sending it in an effort to r

Re: [PATCH v4 1/3] builtin/config: introduce `--default`

2018-04-05 Thread Taylor Blau
On Thu, Apr 05, 2018 at 06:29:49PM -0400, Jeff King wrote: > On Wed, Apr 04, 2018 at 07:59:12PM -0700, Taylor Blau wrote: > > > @@ -286,6 +288,16 @@ static int get_value(const char *key_, const char > > *regex_) > > config_wit

[PATCH v6 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-06 Thread Taylor Blau
rementioned upcoming patch to support querying a color value with a default via `--type=color --default=...`, without squandering `--color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 73 builtin/config.c

[PATCH v6 1/2] builtin/config.c: treat type specifiers singularly

2018-04-06 Thread Taylor Blau
future patch will introduce `--type=`, and we would like not to complain in the following situation: $ git config --int --type=int Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- builtin/config.c | 49 +++--- t/t1300-repo-config.sh | 11 ++ 2

Re: [PATCH v4 3/3] builtin/config: introduce `color` type specifier

2018-04-06 Thread Taylor Blau
On Thu, Apr 05, 2018 at 06:53:20PM -0400, Jeff King wrote: > On Thu, Apr 05, 2018 at 06:52:29PM -0400, Eric Sunshine wrote: > > > On Thu, Apr 5, 2018 at 6:36 PM, Jeff King <p...@peff.net> wrote: > > > On Wed, Apr 04, 2018 at 07:59:17PM -0700, Taylor Blau wrote: > >

Re: [PATCH v5 2/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-06 Thread Taylor Blau
On Fri, Apr 06, 2018 at 02:14:34AM -0400, Eric Sunshine wrote: > On Fri, Apr 6, 2018 at 1:29 AM, Taylor Blau <m...@ttaylorr.com> wrote: > > builtin/config.c: prefer `--type=bool` over `--bool`, etc. > > This patch isn't just preferring --type; it's actually introducing the >

[PATCH v7 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-09 Thread Taylor Blau
rementioned upcoming patch to support querying a color value with a default via `--type=color --default=...`, without squandering `--color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 71 builtin/config.c |

[PATCH v7 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-09 Thread Taylor Blau
the important details. I have a better idea of how to discuss on this list without increasing the re-roll count so much. Thanks in advance for your review :-). Thanks, Taylor [1]: https://public-inbox.org/git/capig+cqxjulwpxfwhq98a23wfaazkzpkovqwbdxakkhliw-...@mail.gmail.com/ Taylor Blau (2

[PATCH v7 1/2] builtin/config.c: treat type specifiers singularly

2018-04-09 Thread Taylor Blau
future patch will introduce `--type=`, and we would like not to complain in the following situation: $ git config --int --type=int Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- builtin/config.c | 49 +++--- t/t1300-repo-config.sh | 11 ++ 2

[PATCH v6 0/3] Teach `--default` to `git-config(1)`

2018-04-09 Thread Taylor Blau
. - Remove extraneous braces, newlines from builtin/config.c. (cc: Eric). - Rename, reorder tests in t1310 to make clear which tests are duals of one another. Use '-c' to introduce short-lived configuration values. (cc: Eric). Thanks, Taylor Taylor Blau (3): builtin/config: introduce

[PATCH v6 2/3] config.c: introduce 'git_config_color' to parse ANSI colors

2018-04-09 Thread Taylor Blau
In preparation for adding `--type=color` to the `git-config(1)` builtin, let's introduce a color parsing utility, `git_config_color` in a similar fashion to `git_config_`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- config.c | 10 ++ config.h | 1 + 2 files changed, 11 inse

[PATCH v6 3/3] builtin/config: introduce `color` type specifier

2018-04-09 Thread Taylor Blau
-get-color` alone. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 6 ++ builtin/config.c | 22 ++ t/t1300-repo-config.sh | 30 ++ 3 files changed, 58 insertions(+) diff --git a/D

[PATCH v6 3/3] builtin/config: introduce `color` type specifier

2018-04-09 Thread Taylor Blau
-get-color` alone. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 6 ++ builtin/config.c | 22 ++ t/t1300-repo-config.sh | 30 ++ 3 files changed, 58 insertions(+) diff --git a/D

[PATCH v6 1/3] builtin/config: introduce `--default`

2018-04-09 Thread Taylor Blau
tion with `--default`) will be sufficient to replace `--get-color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 4 builtin/config.c | 18 ++ t/t1310-config-default.sh| 36 3 files changed, 58

Re: [PATCH v4 1/3] builtin/config: introduce `--default`

2018-04-09 Thread Taylor Blau
On Mon, Apr 09, 2018 at 08:18:18AM +0900, Junio C Hamano wrote: > Jeff King <p...@peff.net> writes: > > > On Wed, Apr 04, 2018 at 07:59:12PM -0700, Taylor Blau wrote: > > > >> @@ -286,6 +288,16 @@ static int get_value(const char *key_, const char > >

Re: [PATCH v7 1/2] builtin/config.c: treat type specifiers singularly

2018-04-09 Thread Taylor Blau
On Tue, Apr 10, 2018 at 10:22:25AM +0900, Junio C Hamano wrote: > Taylor Blau <m...@ttaylorr.com> writes: > > > Internally, we represent `git config`'s type specifiers as a bitset > > using OPT_BIT. 'bool' is 1<<0, 'int' is 1<<1, and so on. This techniq

Re: [PATCH v7 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-09 Thread Taylor Blau
On Tue, Apr 10, 2018 at 10:44:18AM +0900, Junio C Hamano wrote: > Taylor Blau <m...@ttaylorr.com> writes: > > > `git config` has long allowed the ability for callers to provide a 'type > > specifier', which instructs `git config` to (1) ensure that incoming > >

Re: [PATCH v8 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Taylor Blau
On Wed, Apr 11, 2018 at 10:24:45AM +0900, Junio C Hamano wrote: > Taylor Blau <m...@ttaylorr.com> writes: > > > Attached is the eighth re-roll of my series to add `--type=` as > > the preferred alternative for `--`. > > > > The main changes since

Re: [PATCH v8 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Taylor Blau
On Wed, Apr 11, 2018 at 12:11:47PM +0900, Junio C Hamano wrote: > Taylor Blau <m...@ttaylorr.com> writes: > > >> > +#define OPT_CALLBACK_VALUE(s, l, h, f, i) \ > >> > +{ OPTION_CALLBACK, (s), (l), NULL, NULL, (h), PARSE_OPT_NOARG | > >>

[PATCH v8 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Taylor Blau
Thanks in advance for your review. Thanks, Taylor Taylor Blau (2): builtin/config.c: treat type specifiers singularly builtin/config.c: support `--type=` as preferred alias for `--type` Documentation/git-config.txt | 71 +--- builtin/config.c | 101 ++

[PATCH v8 1/2] builtin/config.c: treat type specifiers singularly

2018-04-10 Thread Taylor Blau
future patch will introduce `--type=`, and we would like not to complain in the following situation: $ git config --int --type=int Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- builtin/config.c | 49 +++--- t/t1300-repo-config.sh | 11 ++ 2

[PATCH v8 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Taylor Blau
--int --type=int` (and its commutative pair) does not complain, but `--bool --type=int` (and its commutative pair) does. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 71 builtin/config.c | 62 +

Re: git-lfs question

2018-04-10 Thread Taylor Blau
On Wed, Apr 11, 2018 at 01:16:42AM +, John Sullivan wrote: > Hello - I've seen instructions that say after installing git to also install > git-lfs. > > But today when installing git I noticed that in the install options > there was a default selected options stating "Git LFS (Large File >

[PATCH v9 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-18 Thread Taylor Blau
entual consensus on the interface. Thanks, Taylor Taylor Blau (2): builtin/config.c: treat type specifiers singularly builtin/config.c: support `--type=` as preferred alias for `--type` Documentation/git-config.txt | 71 +--- builtin/config.c

[PATCH v9 1/2] builtin/config.c: treat type specifiers singularly

2018-04-18 Thread Taylor Blau
future patch will introduce `--type=`, and we would like not to complain in the following situation: $ git config --int --type=int Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- builtin/config.c | 49 +++--- t/t1300-repo-config.sh | 11 ++ 2

[PATCH v9 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-18 Thread Taylor Blau
--int --type=int` (and its commutative pair) does not complain, but `--bool --type=int` (and its commutative pair) does. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 71 builtin/config.c | 63 ++

[PATCH 3/6] grep.[ch]: teach columnnum, color_columnno to grep_opt

2018-04-20 Thread Taylor Blau
remain undocumented until 'git-grep(1)' learns the --column option in a forthcoming commit.) Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 8 grep.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/grep.c b/grep.c index 29bc799ecf..7872a5d868 100644 --- a/grep.c

[PATCH 2/6] grep.c: take column number as argument to show_line()

2018-04-20 Thread Taylor Blau
to show_line() in order to pass the new required argument. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/grep.c b/grep.c index 1c25782355..29bc799ecf 100644 --- a/grep.c +++ b/grep.c @@ -1361,7 +1361,7 @@

[PATCH 4/6] grep.c: display column number of first match

2018-04-20 Thread Taylor Blau
context and non-context lines through the '&& cno' check. 'cno' will be equal to zero if and only if show_line() is invoked on a context line. It will be a non-zero value otherwise. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 6 ++ 1 file changed, 6 insertions(

[PATCH 1/6] grep.c: take regmatch_t as argument in match_line()

2018-04-20 Thread Taylor Blau
ove). The return condition remains unchanged, therefore the only change required of callers is the addition of a single argument. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/grep.c b/grep.c index 6

[PATCH 6/6] contrib/git-jump/git-jump: use column number when grep-ing

2018-04-20 Thread Taylor Blau
This patch adds the '--column-number' synonym '-m' to the default grep command so that callers are brought to the correct line _and_ column of each matched location. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- contrib/git-jump/git-jump | 2 +- 1 file changed, 1 insertion(+), 1 de

[PATCH 0/6] Teach '--column-number' to 'git-grep(1)'

2018-04-20 Thread Taylor Blau
patch is extensive, and can serve as a reference during review. Thank you in advance for your time, and--as always--I look forward to your feedback :-). Thanks, Taylor Taylor Blau (6): grep.c: take regmatch_t as argument in match_line() grep.c: take column number as argument to show_line

[PATCH 5/6] builtin/grep.c: show column numbers via --column-number

2018-04-20 Thread Taylor Blau
:# int foo(); .clang-format:75:8:# void 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 <m...@ttaylorr.com> --- Documentation/config.txt

Re: [PATCH v3 7/7] contrib/git-jump/git-jump: jump to match column in addition to line

2018-04-24 Thread Taylor Blau
On Tue, Apr 24, 2018 at 01:37:36AM -0400, Eric Sunshine wrote: > On Tue, Apr 24, 2018 at 1:07 AM, Taylor Blau <m...@ttaylorr.com> wrote: > > Take advantage of 'git-grep(1)''s new option, '--column-number' in order > > to teach Peff's 'git-jump' script how to jump to the corre

Re: [PATCH v2 2/6] grep.c: take column number as argument to show_line()

2018-04-24 Thread Taylor Blau
On Tue, Apr 24, 2018 at 03:13:55PM +0900, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > I think when we add features to git-grep we should be as close to GNU > > grep as possible (e.g. not add this -m alias meaning something different > > as in your v1), but if

[PATCH v2 5/6] builtin/grep.c: show column numbers via --column-number

2018-04-22 Thread Taylor Blau
the casing of nearby variables. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/config.txt | 7 ++- Documentation/git-grep.txt | 8 +++- builtin/grep.c | 1 + t/t7810-grep.sh| 22 ++ 4 files changed, 36 insertions(+), 2 del

[PATCH v2 4/6] grep.c: display column number of first match

2018-04-22 Thread Taylor Blau
context and non-context lines through the '&& cno' check. 'cno' will be equal to zero if and only if show_line() is invoked on a context line. It will be a non-zero value otherwise. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 6 ++ 1 file changed, 6 insertions(

[PATCH v2 3/6] grep.[ch]: teach columnnum, color_columnno to grep_opt

2018-04-22 Thread Taylor Blau
remain undocumented until 'git-grep(1)' learns the --column option in a forthcoming commit.) Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 8 grep.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/grep.c b/grep.c index 29bc799ecf..922ab92eff 100644 --- a/

[PATCH v2 6/6] contrib/git-jump/git-jump: use column number when grep-ing

2018-04-22 Thread Taylor Blau
This patch adds the '--column-number' synonym '-m' to the default grep command so that callers are brought to the correct line _and_ column of each matched location. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- contrib/git-jump/git-jump | 2 +- 1 file changed, 1 insertion(+), 1 de

[PATCH v2 2/6] grep.c: take column number as argument to show_line()

2018-04-22 Thread Taylor Blau
to show_line() in order to pass the new required argument. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/grep.c b/grep.c index 1c25782355..29bc799ecf 100644 --- a/grep.c +++ b/grep.c @@ -1361,7 +1361,7 @@

[PATCH v2 1/6] grep.c: take regmatch_t as argument in match_line()

2018-04-22 Thread Taylor Blau
ove). The return condition remains unchanged, therefore the only change required of callers is the addition of a single argument. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/grep.c b/grep.c index 6

Re: [PATCH v2 5/6] builtin/grep.c: show column numbers via --column-number

2018-04-22 Thread Taylor Blau
On Sun, Apr 22, 2018 at 11:48:53PM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Sun, Apr 22 2018, Taylor Blau wrote: > > I think this part though... > > > While we're at it, change color.grep.linenumber to color.grep.lineNumber > > to match the

Re: [PATCH v2 6/6] contrib/git-jump/git-jump: use column number when grep-ing

2018-04-22 Thread Taylor Blau
On Sun, Apr 22, 2018 at 11:49:39PM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Sun, Apr 22 2018, Taylor Blau wrote: > > > This patch adds the '--column-number' synonym '-m' to the default > > grep command so that callers are brought to the correct line _and_ > > colu

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

2018-04-22 Thread Taylor Blau
On Tue, Apr 17, 2018 at 03:07:46PM +0900, Junio C Hamano wrote: > * tb/config-type (2018-04-10) 2 commits > - builtin/config.c: support `--type=` as preferred alias for `--` > - builtin/config.c: treat type specifiers singularly > (this branch is used by tb/config-default.) > > The "git

Re: [PATCH v2 3/6] grep.[ch]: teach columnnum, color_columnno to grep_opt

2018-04-22 Thread Taylor Blau
On Sun, Apr 22, 2018 at 11:42:48PM +0200, Ævar Arnfjörð Bjarmason wrote: > On Sun, Apr 22 2018, Taylor Blau wrote: > > > In preparation of adding --column-number to 'git-grep(1)', we extend > > grep_opt to take in the requisite new members. > > Just a nit: Makes sense to re

Some mutt(1) patches and scripts

2018-04-22 Thread Taylor Blau
Hi, I have spent more time contributing to the Git list lately, and as such have grown a number of patches and scripts that have been useful for my workflow. I am interested in sharing them here in the hopes that they will be useful for others as well :-). My workflow is as follows: 1. Write

[PATCH v2 0/6] Teach '--column-number' to 'git-grep(1)'

2018-04-22 Thread Taylor Blau
for your second round of review :-). Thanks, Taylor [1]: https://public-inbox.org/git/cef29224-718f-21e9-0242-8bcd8e9c2...@web.de/ [2]: https://public-inbox.org/git/can0hesp_bgqkf26g4tdow6wpsvr2cew6eqf3ajtkcv5pou_...@mail.gmail.com/ Taylor Blau (6): grep.c: take regmatch_t as argument in match_line

Re: [PATCH v2 1/6] grep.c: take regmatch_t as argument in match_line()

2018-04-22 Thread Taylor Blau
On Sun, Apr 22, 2018 at 07:14:58PM -0400, Eric Sunshine wrote: > On Sun, Apr 22, 2018 at 4:47 PM, Taylor Blau <m...@ttaylorr.com> wrote: > > In a subsequent patch, we teach show_line() to optionally include the > > column number of the first match on each matched line. &

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

2018-04-22 Thread Taylor Blau
On Mon, Apr 23, 2018 at 08:33:11AM +0900, Junio C Hamano wrote: > Taylor Blau <m...@ttaylorr.com> writes: > > > I noticed that tb/config-default, however, only landed two commits: > > > > - builtin/config: introduce `color` type specifier > > - config.c: i

Re: [PATCH v2 0/6] Teach '--column-number' to 'git-grep(1)'

2018-04-22 Thread Taylor Blau
On Mon, Apr 23, 2018 at 08:28:14AM +0900, Junio C Hamano wrote: > Taylor Blau <m...@ttaylorr.com> writes: > > > diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh > > index 0cf654824d..7349c7fadc 100755 > > --- a/t/t7810-grep.sh > > +++ b/t/t781

Re: [PATCH v2 5/6] builtin/grep.c: show column numbers via --column-number

2018-04-22 Thread Taylor Blau
On Sun, Apr 22, 2018 at 08:32:28PM -0400, Eric Sunshine wrote: > On Sun, Apr 22, 2018 at 4:47 PM, Taylor Blau <m...@ttaylorr.com> wrote: > > This commit teaches 'git-grep(1)' a new option, '--column-number'. This > > option builds upon previous commits to show the column nu

Re: [PATCH v2 2/6] grep.c: take column number as argument to show_line()

2018-04-22 Thread Taylor Blau
On Sun, Apr 22, 2018 at 08:16:12PM -0400, Eric Sunshine wrote: > On Sun, Apr 22, 2018 at 4:47 PM, Taylor Blau <m...@ttaylorr.com> wrote: > > show_line() currently receives the line number within the > > 'grep_opt->buf' in order to determine which line number to display.

Re: [PATCH v2 4/6] grep.c: display column number of first match

2018-04-22 Thread Taylor Blau
On Sun, Apr 22, 2018 at 08:24:55PM -0400, Eric Sunshine wrote: > On Sun, Apr 22, 2018 at 4:47 PM, Taylor Blau <m...@ttaylorr.com> wrote: > > Building upon our work in the previous commit to add members 'columnnum' > > and 'color_columno' to 'grep_opt', we teach show_line() how

Re: [PATCH v2 3/6] grep.[ch]: teach columnnum, color_columnno to grep_opt

2018-04-22 Thread Taylor Blau
On Sun, Apr 22, 2018 at 08:21:33PM -0400, Eric Sunshine wrote: > On Sun, Apr 22, 2018 at 7:24 PM, Taylor Blau <m...@ttaylorr.com> wrote: > > On Sun, Apr 22, 2018 at 11:42:48PM +0200, Ęvar Arnfjörš Bjarmason wrote: > >> On Sun, Apr 22 2018, Taylor Blau wrote: > &g

Re: [PATCH v2 2/6] grep.c: take column number as argument to show_line()

2018-04-23 Thread Taylor Blau
On Mon, Apr 23, 2018 at 10:01:17AM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Mon, Apr 23 2018, Taylor Blau wrote: > > > For your consideration: > > https://github.com/ttaylorr/git/compare/tb/grep-colno > > Looks good to me aside from two minor issues I noticed:

[PATCH v3 2/7] grep.c: expose matched column in match_line()

2018-04-23 Thread Taylor Blau
from the beginning of the line. This additional argument has no effect when opt->extended is non-zero. We will later pass the starting offset from 'regmatch_t *' to show_line() in order to display the column number of the first match. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- g

[PATCH v3 1/7] Documentation/config.txt: camel-case lineNumber for consistency

2018-04-23 Thread Taylor Blau
lineNumber has casing that is inconsistent with surrounding options, like color.grep.matchContext, and color.grep.matchSelected. Re-case this documentation in order to be consistent with the text around it, and to ensure that new entries are consistent, too. Signed-off-by: Taylor Blau &l

[PATCH v3 0/7] Teach '--column-number' to 'git-grep(1)'

2018-04-23 Thread Taylor Blau
+cr0unm2ukcaphyafrvmypx4vgsw4wdswb_gnwe4ecy...@mail.gmail.com [7]: https://public-inbox.org/git/20180424043140.GA82406@syl.local Taylor Blau (7): Documentation/config.txt: camel-case lineNumber for consistency grep.c: expose matched column in match_line() grep.[ch]: extend grep_opt to allow showing matched column grep.c: display

Re: [PATCH v2 2/6] grep.c: take column number as argument to show_line()

2018-04-23 Thread Taylor Blau
On Mon, Apr 23, 2018 at 03:34:21AM -0400, Eric Sunshine wrote: > On Mon, Apr 23, 2018 at 3:27 AM, Ævar Arnfjörð Bjarmason > wrote: > > On Mon, Apr 23 2018, Eric Sunshine wrote: > >> One important issue I noticed is that patch 3/7 neglects to update > >>

[PATCH v3 6/7] grep.c: add configuration variables to show matched option

2018-04-23 Thread Taylor Blau
To support git-grep(1)'s new option, '--column-number', document and teach grep.c how to interpret relevant configuration options, similar to those associated with '--line-number'. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/config.txt | 5 + Documentation/git-gr

[PATCH v3 5/7] builtin/grep.c: add '--column-number' option to 'git-grep(1)'

2018-04-23 Thread Taylor Blau
foo() Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-grep.txt | 5 - builtin/grep.c | 1 + t/t7810-grep.sh| 22 ++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Documentation/git-grep.txt b/Documentati

[PATCH v3 4/7] grep.c: display column number of first match

2018-04-23 Thread Taylor Blau
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 <m...@ttaylorr.com> --- grep.c | 21 - 1 file changed, 16 insertions(+), 5 deletions(-) diff

[PATCH v3 3/7] grep.[ch]: extend grep_opt to allow showing matched column

2018-04-23 Thread Taylor Blau
To support showing the matched column when calling 'git-grep(1)', teach 'grep_opt' the normal set of options to configure the default behavior and colorization of this feature. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- grep.c | 3 +++ grep.h | 2 ++ 2 files changed, 5 inse

[PATCH v3 7/7] contrib/git-jump/git-jump: jump to match column in addition to line

2018-04-23 Thread Taylor Blau
Take advantage of 'git-grep(1)''s new option, '--column-number' in order to teach Peff's 'git-jump' script how to jump to the correct column for any given match. 'git-grep(1)''s output is in the correct format for Vim's jump list, so no additional cleanup is necessary. Signed-off-by: Taylor Blau

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

2018-04-17 Thread Taylor Blau
On Tue, Apr 17, 2018 at 12:08:20PM -0600, Ben Toews wrote: > On Mon, Apr 16, 2018 at 7:54 PM, Junio C Hamano wrote: > > "brian m. carlson" writes: > > > >> If we just want to add gpgsm support, that's fine, but we should be > >> transparent about

Re: [PATCH v9 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-18 Thread Taylor Blau
On Thu, Apr 19, 2018 at 11:47:50AM +0900, Junio C Hamano wrote: > Taylor Blau <m...@ttaylorr.com> writes: > > > diff --git a/builtin/config.c b/builtin/config.c > > index 92fb8d56b1..bd7a8d0ce7 100644 > > --- a/builtin/config.c > > +++ b/builtin/config

Re: Git Question

2018-03-31 Thread Taylor Blau
On Sat, Mar 31, 2018 at 09:06:53PM -0500, Mark Wartman wrote: > I saw this pretty exhaustive .gitignore list that a GitHub Help page > linked to: 9257657 . Are > these configurations from the list something one should install on the > User/global level,

[PATCH] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-03-28 Thread Taylor Blau
atch to add `--color` (in the non-traditional sense) via `--type=color`, instead of `--color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 66 +++- builtin/config.c | 25 ++ t/t1300-repo-config.sh

Re: [PATCH v2 1/4] builtin/config: introduce `--default`

2018-03-28 Thread Taylor Blau
On Mon, Mar 26, 2018 at 04:34:42AM -0400, Jeff King wrote: > > diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt > > index e09ed5d7d..d9e389a33 100644 > > --- a/Documentation/git-config.txt > > +++ b/Documentation/git-config.txt > > @@ -233,8 +233,10 @@ See also <>. > >

Re: [PATCH v2 2/4] Documentation: list all type specifiers in config prose

2018-03-28 Thread Taylor Blau
On Mon, Mar 26, 2018 at 04:55:56AM -0400, Jeff King wrote: > In fact, that kind of makes me wonder if this "type" list should not > exist at all. If we instead grouped the options and said "these are the > type options", then we'd only need one list. > > I'm OK to punt on that for now, though, in

Re: [PATCH v3 0/4] Teach `--default` to `git-config(1)`

2018-03-28 Thread Taylor Blau
On Wed, Mar 28, 2018 at 06:16:31PM -0700, Taylor Blau wrote: > Attached is 'v3' of my patch series to add a `--default` option to `git > config`. My apologies, this patch series is only 3 long, so the subject line of this message is incorrect. Thanks, Taylor

Re: [PATCH v2 4/4] builtin/config: introduce `--color` type specifier

2018-03-28 Thread Taylor Blau
On Mon, Mar 26, 2018 at 05:16:45AM -0400, Jeff King wrote: > On Fri, Mar 23, 2018 at 08:55:56PM -0400, Taylor Blau wrote: > > > As of this commit, the canonical way to retreive an ANSI-compatible > > color escape sequence from a configuration file is with the > > `--

[PATCH v3 0/4] Teach `--default` to `git-config(1)`

2018-03-28 Thread Taylor Blau
canonicalized value during normalization. As always, thank you for the helpful feedback. I look forward to your thoughts on this version of the series. Thanks, Taylor Taylor Blau (3): builtin/config: introduce `--default` config.c: introduce 'git_config_color' to parse ANSI colors builtin/

[PATCH v3 3/3] builtin/config: introduce `color` type specifier

2018-03-28 Thread Taylor Blau
-get-color` alone. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 11 +++ builtin/config.c | 21 + t/t1300-repo-config.sh | 30 ++ 3 files changed, 58 insertions(+), 4 deletion

[PATCH v3 1/3] builtin/config: introduce `--default`

2018-03-28 Thread Taylor Blau
replace `--get-color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 4 builtin/config.c | 17 t/t1310-config-default.sh| 38 3 files changed, 59 insertions(+) create mode 100755

[PATCH v3 2/3] config.c: introduce 'git_config_color' to parse ANSI colors

2018-03-28 Thread Taylor Blau
In preparation for adding `--color` to the `git-config(1)` builtin, let's introduce a color parsing utility, `git_config_color` in a similar fashion to `git_config_`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- config.c | 10 ++ config.h | 1 + 2 files changed, 11 inse

Re: Git Question

2018-03-28 Thread Taylor Blau
On Wed, Mar 28, 2018 at 08:49:19PM -0500, Mark Wartman wrote: > I am following this tutorial and I expected to only see user.name & > user.email, so what are the filters.lfs’s and the credential.helper? > Should I ignore them, or try to get rid of them? Please advise. The `filter.lfs`

[PATCH v2 2/4] Documentation: list all type specifiers in config prose

2018-03-23 Thread Taylor Blau
-color`, so that this section will not lag behind when yet more new specifiers are added. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 25 +++-- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Documentation/git-

[PATCH v2 4/4] builtin/config: introduce `--color` type specifier

2018-03-23 Thread Taylor Blau
lor` alone. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 7 +++ builtin/config.c | 13 + t/t1300-repo-config.sh | 24 t/t1310-config-default.sh| 6 ++ 4 files changed, 50 insertion

[PATCH v2 0/4] Teach `--default` to `git-config(1)`

2018-03-23 Thread Taylor Blau
of the office last week, and have been quite busy since catching up on Git LFS-related issues. Thanks, Taylor Taylor Blau (4): builtin/config: introduce `--default` Documentation: list all type specifiers in config prose config.c: introduce 'git_config_color' to parse ANSI colors builtin/config

[PATCH v2 3/4] config.c: introduce 'git_config_color' to parse ANSI colors

2018-03-23 Thread Taylor Blau
In preparation for adding `--color` to the `git-config(1)` builtin, let's introduce a color parsing utility, `git_config_color` in a similar fashion to `git_config_`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- config.c | 10 ++ config.h | 1 + 2 files changed, 11 inse

[PATCH v2 1/4] builtin/config: introduce `--default`

2018-03-23 Thread Taylor Blau
replace `--get-color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 6 +- builtin/config.c | 17 + t/t1310-config-default.sh| 125 +++ 3 files changed, 146 insertions(+), 2 deletions(-) create

[PATCH v3 1/2] builtin/config.c: treat type specifiers singularly

2018-04-04 Thread Taylor Blau
future patch will introduce `--type=`, and we would like not to complain in the following situation: $ git config --int --type=int Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- builtin/config.c | 49 +++--- t/t1300-repo-config.sh | 11 ++ 2

[PATCH v3 2/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc.

2018-04-04 Thread Taylor Blau
atch to add `--color` (in the non-traditional sense) via `--type=color`, instead of `--color`. Signed-off-by: Taylor Blau <m...@ttaylorr.com> --- Documentation/git-config.txt | 66 +++- builtin/config.c | 28 +++ t/t1300-repo-config.sh

<    1   2   3   4   >