Re: [PATCH v4 9/9] Documentation/config: add odb..promisorRemote

2018-09-26 Thread Taylor Blau
On Wed, Sep 26, 2018 at 12:12:22AM -0400, Jeff King wrote: > On Tue, Sep 25, 2018 at 03:31:36PM -0700, Junio C Hamano wrote: > > > Christian Couder writes: > > > > > The main issue that this patch series tries to solve is that > > > extensions.partialclone config option limits the partial clone an

Re: [PATCH] git.txt: mention mailing list archive

2018-09-26 Thread Taylor Blau
On Wed, Sep 26, 2018 at 10:05:29AM +0200, Martin Ågren wrote: > On Thu, 20 Sep 2018 at 21:07, Junio C Hamano wrote: > > > > Martin Ågren writes: > > > > > In the "Reporting Bugs" section of git(1), we refer to the mailing list, > > > but we do not give any hint about where the archives might be f

Re: [PATCH] help: allow redirecting to help for aliased command

2018-09-26 Thread Taylor Blau
On Wed, Sep 26, 2018 at 12:26:36PM +0200, Rasmus Villemoes wrote: > I often use 'git --help' as a quick way to get the documentation > for a command. However, I've also trained my muscle memory to use my > aliases (cp=cherry-pick, co=checkout etc.), which means that I often end > up doing > > gi

Re: [PATCH] help: allow redirecting to help for aliased command

2018-09-26 Thread Taylor Blau
On Wed, Sep 26, 2018 at 08:30:32AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > >> +help.followAlias:: > >> + When requesting help for an alias, git prints a line of the > >> + form "'' is aliased to ''". If this option

Re: [PATCH] help: allow redirecting to help for aliased command

2018-09-26 Thread Taylor Blau
On Wed, Sep 26, 2018 at 08:16:36AM -0700, Junio C Hamano wrote: > Rasmus Villemoes writes: > > > I often use 'git --help' as a quick way to get the documentation > > for a command. However, I've also trained my muscle memory to use my > > aliases (cp=cherry-pick, co=checkout etc.), which means th

Re: [PATCH] t7005-editor: quote filename to fix whitespace-issue

2018-09-26 Thread Taylor Blau
s below look sane to me. Since I couldn't find any other style in the surrounding script that needed matching against, this has my: Reviewed-by: Taylor Blau Thanks, Taylor

Re: [PATCH] git help: promote 'git help -av'

2018-09-27 Thread Taylor Blau
On Wed, Sep 26, 2018 at 10:28:31AM -0700, Junio C Hamano wrote: > Duy Nguyen writes: > > > Here's the patch that adds that external commands and aliases > > sections. I feel that external commands section is definitely good to > > have even if we don't replace "help -a". Aliases are more > > subje

Re: [PATCH v2 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-27 Thread Taylor Blau
On Wed, Sep 26, 2018 at 02:38:53PM -0400, Jeff King wrote: > On Wed, Sep 26, 2018 at 06:39:56AM -0700, Taylor Blau wrote: > > > > A perl tangent if you're interested: > > [...] > > > > To be clear, we ought to leave this function as: > > > >

[PATCH v3 3/4] transport.c: introduce core.alternateRefsCommand

2018-09-27 Thread Taylor Blau
to run in the shell. To behave differently on each alternate (e.g., only list tags from alternate A, only heads from B) provide the path of the alternate as the first argument. Signed-off-by: Taylor Blau --- Documentation/config.txt | 11 + t/t5410-receive-pack.sh | 49 +

[PATCH v3 2/4] transport.c: extract 'fill_alternate_refs_command'

2018-09-27 Thread Taylor Blau
te_refs' to 'fill_alternate_refs_command'. Signed-off-by: Taylor Blau --- transport.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/transport.c b/transport.c index 2e0bc414d0..2825debac5 100644 --- a/transport.c +++ b/transport.c @@ -1325

[PATCH v3 0/4] Filter alternate references

2018-09-27 Thread Taylor Blau
stasis there. Anything that is left outstanding from v3 should hopefully be similarly-not-earth-shattering ;-). Thanks in advance for your review. Thanks, Taylor Jeff King (1): transport: drop refnames from for_each_alternate_ref Taylor Blau (3): transport.c: extract 'fill_alternat

[PATCH v3 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-09-27 Thread Taylor Blau
multiple prefixes, they may separate them by whitespace. If "core.alternateRefsCommand" is set, it will take precedence over "core.alternateRefsPrefixes". Signed-off-by: Taylor Blau --- Documentation/config.txt | 7 +++ t/t5410-receive-pack.sh | 8 transport.c | 5 +++

Re: [PATCH 1/1] roll wt_status_state into wt_status and populate in the collect phase

2018-09-28 Thread Taylor Blau
On Thu, Sep 27, 2018 at 09:49:36PM -0700, Stephen P. Smith wrote: > When updating the collect and print functions, it was found that > status variables were initialized in the collect phase and some > variables were later freed in the print functions. Nit: I think that in the past Eric Sunshine ha

Re: [PATCH v3 1/4] transport: drop refnames from for_each_alternate_ref

2018-09-28 Thread Taylor Blau
On Fri, Sep 28, 2018 at 12:58:58AM -0400, Jeff King wrote: > > From: Jeff King > > Pretty sure that isn't right. :) Indeed that isn't right :-). I try my best to review my patches diligently before submitting them, but here's an interesting side-story if you're interested: I use a script 'git ma

Re: [PATCH] git help: promote 'git help -av'

2018-09-28 Thread Taylor Blau
On Fri, Sep 28, 2018 at 09:30:51AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > On Wed, Sep 26, 2018 at 10:28:31AM -0700, Junio C Hamano wrote: > >> Duy Nguyen writes: > >> > >> > Here's the patch that adds that external commands an

Re: [PATCH v3 3/4] transport.c: introduce core.alternateRefsCommand

2018-09-28 Thread Taylor Blau
On Fri, Sep 28, 2018 at 01:26:13AM -0400, Jeff King wrote: > On Thu, Sep 27, 2018 at 09:25:42PM -0700, Taylor Blau wrote: > > > Let the repository that has alternates configure this command to avoid > > trusting the alternate to provide us a safe command to run in the sh

Re: [PATCH v3 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-09-28 Thread Taylor Blau
On Fri, Sep 28, 2018 at 01:30:57AM -0400, Jeff King wrote: > On Thu, Sep 27, 2018 at 09:25:45PM -0700, Taylor Blau wrote: > > > The recently-introduced "core.alternateRefsCommand" allows callers to > > specify with high flexibility the tips that they wish to adverti

Re: [PATCH v2] help -a: improve and make --verbose default

2018-10-01 Thread Taylor Blau
27;help -av' default and the user would need to type 'help -a > --no-verbose' to get the old printout back. 'help -av' also has > external commands and aliases. Thanks. This looks like what I would have expected based on my recollection of the discussion earlier on v1, so this has my: Reviewed-by: Taylor Blau Thanks, Taylor

Re: Git Evolve

2018-10-01 Thread Taylor Blau
Hi Stefan, On Sat, Sep 29, 2018 at 04:00:04PM -0700, Stefan Xenos wrote: > Hello, List! > > I'm interested in porting something like Mercurial's evolve command to > Git. Welcome to Git :-). I think that the discussion in this thread is good, but it's not why I'm replying. I have also wanted a Mer

Re: [PATCH v3 3/4] transport.c: introduce core.alternateRefsCommand

2018-10-01 Thread Taylor Blau
On Sat, Sep 29, 2018 at 03:31:38AM -0400, Jeff King wrote: > On Fri, Sep 28, 2018 at 03:04:10PM -0700, Taylor Blau wrote: > > > > Well, you also need to pass the path so it knows which repo to look at. > > > Which I think is the primary reason we do it, but behaving di

Re: [PATCH v3 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-10-01 Thread Taylor Blau
On Sat, Sep 29, 2018 at 03:34:26AM -0400, Jeff King wrote: > On Fri, Sep 28, 2018 at 03:05:57PM -0700, Taylor Blau wrote: > > > > > For example, to advertise only tags, a caller using > > > > 'core.alternateRefsCommand' would have to do: > > > &

Re: [PATCH v3 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-10-01 Thread Taylor Blau
On Mon, Oct 01, 2018 at 06:57:37PM -0700, Taylor Blau wrote: > On Sat, Sep 29, 2018 at 03:34:26AM -0400, Jeff King wrote: > > On Fri, Sep 28, 2018 at 03:05:57PM -0700, Taylor Blau wrote: > > > > > > > For example, to advertise only tags, a caller using > > >

[PATCH v4 0/4] Filter alternate references

2018-10-01 Thread Taylor Blau
ode has changed since the v2. Thanks again for all of your review. Thanks, Taylor Jeff King (1): transport: drop refnames from for_each_alternate_ref Taylor Blau (3): transport.c: extract 'fill_alternate_refs_command' transport.c: introduce core.alternateR

[PATCH v4 1/4] transport: drop refnames from for_each_alternate_ref

2018-10-01 Thread Taylor Blau
eff King Signed-off-by: Taylor Blau --- builtin/receive-pack.c | 3 +-- fetch-pack.c | 3 +-- transport.c| 6 +++--- transport.h| 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 4d3000195

[PATCH v4 3/4] transport.c: introduce core.alternateRefsCommand

2018-10-01 Thread Taylor Blau
run in the shell. To find the alternate, pass its absolute path as the first argument. Signed-off-by: Taylor Blau --- Documentation/config.txt | 16 +++ t/t5410-receive-pack-alternates.sh | 33 ++ transport.c| 19 +--

[PATCH v4 2/4] transport.c: extract 'fill_alternate_refs_command'

2018-10-01 Thread Taylor Blau
te_refs' to 'fill_alternate_refs_command'. Signed-off-by: Taylor Blau --- transport.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/transport.c b/transport.c index 2e0bc414d0..2825debac5 100644 --- a/transport.c +++ b/transport.c @@ -1325

[PATCH v4 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-10-01 Thread Taylor Blau
e caller wishes to specify multiple prefixes, they may separate them by whitespace. If "core.alternateRefsCommand" is set, it will take precedence over "core.alternateRefsPrefixes". Signed-off-by: Taylor Blau --- Documentation/config.txt | 7 +++ t/t5410-receiv

Re: cannot dowload from your amazon server a windows git distro

2018-10-02 Thread Taylor Blau
Hi, On Tue, Oct 02, 2018 at 01:59:51PM +0700, WEB0 - Helmut wrote: > hi, > you amazon download is not working. > do you have some free location to download please? I was able to download both 32- and 64-bit copies of the non-portable Windows installer for version 2.19.0. I used the link at [1] to

Re: Git Evolve

2018-10-02 Thread Taylor Blau
On Tue, Oct 02, 2018 at 11:11:11AM +0200, Ævar Arnfjörð Bjarmason wrote: You timed this email quite well ;-). > On Tue, Oct 02 2018, Taylor Blau wrote: > > > Hi Stefan, > > > > On Sat, Sep 29, 2018 at 04:00:04PM -0700, Stefan Xenos wrote: > >> Hello, List! &g

[PATCH v4 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-10-02 Thread Taylor Blau
On Tue, Oct 02, 2018 at 04:13:13PM +0100, Ramsay Jones wrote: > > On 02/10/18 03:24, Taylor Blau wrote: > [snip] > > diff --git a/t/t5410-receive-pack-alternates.sh > > b/t/t5410-receive-pack-alternates.sh > > index 49d0fe44fb..94794c35da 100755 > > --- a/t

Re: [PATCH v4 3/4] transport.c: introduce core.alternateRefsCommand

2018-10-03 Thread Taylor Blau
On Tue, Oct 02, 2018 at 07:40:56PM -0400, Jeff King wrote: > On Mon, Oct 01, 2018 at 07:23:58PM -0700, Taylor Blau wrote: > > > +core.alternateRefsCommand:: > > + When advertising tips of available history from an alternate, use the > > shell to > > + execute th

[PATCH v5 2/4] transport.c: extract 'fill_alternate_refs_command'

2018-10-08 Thread Taylor Blau
te_refs' to 'fill_alternate_refs_command'. Signed-off-by: Taylor Blau --- transport.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/transport.c b/transport.c index 2e0bc414d0..2825debac5 100644 --- a/transport.c +++ b/transport.c @@ -1325

[PATCH v5 3/4] transport.c: introduce core.alternateRefsCommand

2018-10-08 Thread Taylor Blau
run in the shell. To find the alternate, pass its absolute path as the first argument. Signed-off-by: Taylor Blau --- Documentation/config.txt | 11 ++ t/t5410-receive-pack-alternates.sh | 33 ++ transport.c| 19 +--

[PATCH v5 1/4] transport: drop refnames from for_each_alternate_ref

2018-10-08 Thread Taylor Blau
eff King Signed-off-by: Taylor Blau --- builtin/receive-pack.c | 3 +-- fetch-pack.c | 3 +-- transport.c| 6 +++--- transport.h| 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 4d3000195

[PATCH v5 0/4] Filter alternate references

2018-10-08 Thread Taylor Blau
vance for your review. Thanks, Taylor Jeff King (1): transport: drop refnames from for_each_alternate_ref Taylor Blau (3): transport.c: extract 'fill_alternate_refs_command' transport.c: introduce core.alternateRefsCommand transport.c: introduce core.alternateRefsPrefixes

[PATCH v5 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-10-08 Thread Taylor Blau
e caller wishes to specify multiple prefixes, they may separate them by whitespace. If "core.alternateRefsCommand" is set, it will take precedence over "core.alternateRefsPrefixes". Signed-off-by: Taylor Blau --- Documentation/config.txt | 7 +++ t/t5410-receiv

Re: [PATCH v3 0/2] EditorConfig file

2018-10-08 Thread Taylor Blau
ength. Thanks for both of these. I think that v3 is ready for queueing, if other folks find it OK to have an .editorconfig in the repository. Therefore: Reviewed-by: Taylor Blau Thanks, Taylor

Re: [PATCH v5 0/4] Filter alternate references

2018-10-09 Thread Taylor Blau
On Mon, Oct 08, 2018 at 11:09:18PM -0400, Jeff King wrote: > On Mon, Oct 08, 2018 at 11:09:20AM -0700, Taylor Blau wrote: > > > Attached is (what I anticipate to be) the final re-roll of my series to > > introduce 'core.alternateRefsCommand' and 'core.alternateRe

Re: [PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-15 Thread Taylor Blau
Hi Johannes, Thanks for putting this together, and offering to build Git on Azure Pipelines. I haven't followed v1 of this series very closely, so please excuse me if my comments have already been addressed, and I missed them in a skim of the last revision. On Mon, Oct 15, 2018 at 03:11:57AM -070

Re: [PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-15 Thread Taylor Blau
On Mon, Oct 15, 2018 at 04:55:25PM +0200, Johannes Schindelin wrote: > Hi Taylor, > > On Mon, 15 Oct 2018, Taylor Blau wrote: > > > Thanks for putting this together, and offering to build Git on Azure > > Pipelines. I haven't followed v1 of this series very closely,

Re: What's cooking in git.git (May 2018, #04; Wed, 30)

2018-06-11 Thread Taylor Blau
On Wed, May 30, 2018 at 09:12:10AM -0700, Taylor Blau wrote: > On Wed, May 30, 2018 at 09:09:08AM -0700, Taylor Blau wrote: > > [...] > > > > I have these patches mostly updated on my copy (available at > > https://github.com/ttaylorr/git/compare/tb/grep-column) but a

[PATCH 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-18 Thread Taylor Blau
be OK. I figure that enough has changed that I'd rather not clutter an already busy thread. Thanks, Taylor Taylor Blau (7): Documentation/config.txt: camel-case lineNumber for consistency grep.c: expose {,inverted} match column in match_line() grep.[ch]: extend grep_opt to allow show

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

2018-06-18 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 --- grep.c | 3 +++ grep.h | 2 ++ 2 files changed, 5 insertions(+) d

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

2018-06-18 Thread Taylor Blau
s similar additional scripting capabilities. For example: $ git grep -n --column foo | head -n3 .clang-format:51:14:# myFunction(foo, bar, baz); .clang-format:64:7:# int foo(); .clang-format:75:8:# void foo() Signed-off-by: Taylor Blau --- Documentation/git-grep.txt | 6 +++- builtin/grep

[PATCH 7/7] contrib/git-jump/git-jump: jump to exact location

2018-06-18 Thread Taylor Blau
Take advantage of 'git-grep(1)''s new option, '--column' 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

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

2018-06-18 Thread Taylor Blau
To prepare for 'git grep' learning '--column', teach grep.c's show_line() how to show the column of the first match on non-context lines. Signed-off-by: Taylor Blau --- grep.c | 30 +- 1 file changed, 25 insertions(+), 5 deletions(-) dif

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

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

[PATCH 2/7] grep.c: expose {,inverted} match column in match_line()

2018-06-18 Thread Taylor Blau
n we later pick between the two new results in order to display the column number of the first match on a line with --column. Co-authored-by: Jeff King Signed-off-by: Taylor Blau --- grep.c | 56 ++-- 1 file changed, 38 insertions(+), 18 deleti

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

2018-06-18 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

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

2018-06-19 Thread Taylor Blau
On Tue, Jun 19, 2018 at 12:28:26PM -0400, Jeff King wrote: > On Mon, Jun 18, 2018 at 06:43:14PM -0500, Taylor Blau wrote: > > > static void show_line(struct grep_opt *opt, char *bol, char *eol, > > - const char *name, unsigned lno, char sign) > > +

Re: [PATCH 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-19 Thread Taylor Blau
On Tue, Jun 19, 2018 at 09:46:16AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > Attached is a ``fresh start'' of my series to teach 'git grep --column'. > > Since the last time I sent this, much has changed, notably the semantics > > for d

Re: [PATCH 2/7] grep.c: expose {,inverted} match column in match_line()

2018-06-19 Thread Taylor Blau
On Tue, Jun 19, 2018 at 09:49:21AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > case GREP_NODE_NOT: > > - h = !match_expr_eval(x->u.unary, bol, eol, ctx, 0); > > + /* > > +* Upon visiting a GREP_

Re: [PATCH 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-19 Thread Taylor Blau
On Tue, Jun 19, 2018 at 07:33:39PM +0200, René Scharfe wrote: > Am 19.06.2018 um 18:35 schrieb Jeff King: > > On Mon, Jun 18, 2018 at 06:43:01PM -0500, Taylor Blau wrote: > >> The notable case that it does _not_ cover is matching the following > >> line: > >>

Re: [PATCH 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-19 Thread Taylor Blau
On Tue, Jun 19, 2018 at 01:48:47PM -0400, Jeff King wrote: > On Tue, Jun 19, 2018 at 07:33:39PM +0200, René Scharfe wrote: > > Disabling that optimization for --column wouldn't be a regression since > > it's a new option.. Picking a random result (based on the order of > > evaluation) seems sloppy

Re: [PATCH 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-19 Thread Taylor Blau
On Tue, Jun 19, 2018 at 10:58:30AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Although there are interesting cases around inversion. For example: > > > > git grep --not \( --not -e a --and --not -e b \) > > > > is equivalent to: > > > > git grep -e a --or -e b > > > > Do people car

Re: [PATCH 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-19 Thread Taylor Blau
On Mon, Jun 18, 2018 at 06:43:01PM -0500, Taylor Blau wrote: > Hi, > > Attached is a ``fresh start'' of my series to teach 'git grep --column'. > Since the last time I sent this, much has changed, notably the semantics > for deciding which column is the first wh

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

2018-06-20 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

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

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

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

2018-06-20 Thread Taylor Blau
are always filled with the earliest matches on each line. In addition, don't return the first match from match_line(), for the same reason. Signed-off-by: Taylor Blau --- grep.c | 33 +++-- grep.h | 2 ++ 2 files changed, 29 insertions(+), 6 deletions(-) diff -

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

2018-06-20 Thread Taylor Blau
To prepare for 'git grep' learning '--column', teach grep.c's show_line() how to show the column of the first match on non-context lines. Signed-off-by: Taylor Blau --- grep.c | 33 - 1 file changed, 28 insertions(+), 5 deletions(-) dif

[PATCH v2 7/7] contrib/git-jump/git-jump: jump to exact location

2018-06-20 Thread Taylor Blau
Take advantage of 'git-grep(1)''s new option, '--column' 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

[PATCH v2 2/7] grep.c: expose {,inverted} match column in match_line()

2018-06-20 Thread Taylor Blau
l when we later pick between the two new results in order to display the column number of the first match on a line with --column. Co-authored-by: Jeff King Signed-off-by: Taylor Blau --- grep.c | 58 +++--- 1 file changed, 39 insertions(+

[PATCH v2 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-20 Thread Taylor Blau
ps://public-inbox.org/git/xmqqwouuvi0e@gitster-ct.c.googlers.com/ [2]: https://public-inbox.org/git/20180619174452.ga47...@syl.attlocal.net/ [3]: https://public-inbox.org/git/80b9a0b1-3849-7097-fe1a-dd80835d6...@web.de/ Taylor Blau (7): Documentation/config.txt: camel-case lineNumber for consis

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

2018-06-20 Thread Taylor Blau
s similar additional scripting capabilities. For example: $ git grep -n --column foo | head -n3 .clang-format:51:14:# myFunction(foo, bar, baz); .clang-format:64:7:# int foo(); .clang-format:75:8:# void foo() Signed-off-by: Taylor Blau --- Documentation/git-grep.txt | 6 ++- builtin/grep.c

Re: [PATCH v2 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-21 Thread Taylor Blau
On Thu, Jun 21, 2018 at 07:53:02AM -0400, Jeff King wrote: > On Wed, Jun 20, 2018 at 03:05:30PM -0500, Taylor Blau wrote: > > > Hi, > > > > Here is a re-roll of my series to add --column to 'git-grep(1)'. Since > > last time, not much has changed other th

[PATCH v3 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-22 Thread Taylor Blau
behavior (i.e., '--not \( -e x --and -e y \)'). Thanks, Taylor [1]: https://public-inbox.org/git/20180621115302.gb15...@sigill.intra.peff.net/ Taylor Blau (7): Documentation/config.txt: camel-case lineNumber for consistency grep.c: expose {,inverted} match column in match_line() gre

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

2018-06-22 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

[PATCH v3 2/7] grep.c: expose {,inverted} match column in match_line()

2018-06-22 Thread Taylor Blau
display the column number of the first match on a line with --column. Co-authored-by: Jeff King Signed-off-by: Taylor Blau --- grep.c | 58 +++--- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/grep.c b/grep.c index 45ec7e6

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

2018-06-22 Thread Taylor Blau
col and icol are always filled with the earliest matches on each line. In addition, don't return the first match from match_line(), for the same reason. Signed-off-by: Taylor Blau --- grep.c | 47 +-- grep.h | 2 ++ 2 files changed, 39 insertions(+),

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

2018-06-22 Thread Taylor Blau
To prepare for 'git grep' learning '--column', teach grep.c's show_line() how to show the column of the first match on non-context lines. Signed-off-by: Taylor Blau --- grep.c | 33 - 1 file changed, 28 insertions(+), 5 deletions(-) dif

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

2018-06-22 Thread Taylor Blau
s similar additional scripting capabilities. For example: $ git grep -n --column foo | head -n3 .clang-format:51:14:# myFunction(foo, bar, baz); .clang-format:64:7:# int foo(); .clang-format:75:8:# void foo() Signed-off-by: Taylor Blau --- Documentation/git-grep.txt | 6 ++- builtin/grep.c

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

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

[PATCH v3 7/7] contrib/git-jump/git-jump: jump to exact location

2018-06-22 Thread Taylor Blau
Take advantage of 'git-grep(1)''s new option, '--column' 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

Re: [PATCH v3 0/7] grep.c: teach --column to 'git-grep(1)'

2018-06-25 Thread Taylor Blau
On Mon, Jun 25, 2018 at 02:43:50PM -0400, Jeff King wrote: > On Fri, Jun 22, 2018 at 10:49:26AM -0500, Taylor Blau wrote: > > Since the last time, only a couple of things have changed at Peff's > > suggestions in [1]. The changes are summarized here, and an inter-diff &g

[PATCH 0/2] grep.c: teach --only-matching to 'git-grep(1)'

2018-06-25 Thread Taylor Blau
ed this thread in order to not clutter the old one. I rewrote the patches from scratch today, and have based them on tb/grep-colno, on top of which they should apply cleanly. Thanks in advance for your kind review :-). Thanks, Taylor [1]: https://public-inbox.org/git/cover.1525492696.git...@ttaylorr.c

[PATCH 2/2] grep.c: teach 'git grep --only-matching'

2018-06-25 Thread Taylor Blau
handled as a special case within the main loop to avoid polluting the surrounding code with conditionals that have large blocks. Signed-off-by: Taylor Blau --- builtin/grep.c | 6 ++ grep.c | 48 +--- grep.h | 1 +

[PATCH 1/2] grep.c: extract show_line_header()

2018-06-25 Thread Taylor Blau
be used within the colorization loop to print out only the matching parts of a line, optionally with LFs delimiting sub-matches. Signed-off-by: Taylor Blau --- grep.c | 44 +--- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/grep.c b/grep.c

Re: [PATCH 2/2] grep.c: teach 'git grep --only-matching'

2018-06-27 Thread Taylor Blau
On Wed, Jun 27, 2018 at 09:40:10AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > - if (sign == ':') > > - match_color = opt->color_match_selected; > > - else > > - match_color = opt->

Re: [PATCH 2/2] grep.c: teach 'git grep --only-matching'

2018-06-27 Thread Taylor Blau
On Wed, Jun 27, 2018 at 02:11:13PM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > >> Just initializing match_color where it is defined at the beginning of > >> show_line() should be sufficient, I think. > > > > I think that we could also use the f

[PATCH v2 1/2] grep.c: extract show_line_header()

2018-07-02 Thread Taylor Blau
be used within the colorization loop to print out only the matching parts of a line, optionally with LFs delimiting sub-matches. Signed-off-by: Taylor Blau --- grep.c | 44 +--- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/grep.c b/grep.c

[PATCH v2 2/2] grep.c: teach 'git grep --only-matching'

2018-07-02 Thread Taylor Blau
handled as a special case within the main loop to avoid polluting the surrounding code with conditionals that have large blocks. Signed-off-by: Taylor Blau --- builtin/grep.c | 6 ++ grep.c | 51 + grep.h | 1 +

[PATCH v2 0/2] teach --only-matching to 'git-grep(1)'

2018-07-02 Thread Taylor Blau
ilencing 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@gitster-ct.c.googlers.com/ Taylor Blau (2): grep.c: extract show_line_header() grep.c: te

Re: [PATCH] t5500: prettify non-commit tag tests

2018-07-03 Thread Taylor Blau
On Tue, Jul 03, 2018 at 12:55:19PM -0400, Jeff King wrote: > We don't need to use backslash continuation, as the "&&" > already provides continuation (and happily soaks up empty > lines between commands). OK. That seems correct according to my recollection. > We can also expand the multi-line pri

[PATCH v3 1/2] grep.c: extract show_line_header()

2018-07-03 Thread Taylor Blau
be used within the colorization loop to print out only the matching parts of a line, optionally with LFs delimiting sub-matches. Signed-off-by: Taylor Blau --- grep.c | 44 +--- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/grep.c b/grep.c

[PATCH v3 2/2] grep.c: teach 'git grep --only-matching'

2018-07-03 Thread Taylor Blau
umn offset. The line header and newlines are handled as a special case within the main loop to avoid polluting the surrounding code with conditionals that have large blocks. Signed-off-by: Taylor Blau --- Documentation/git-grep.txt | 6 - builtin/grep.c | 6 + grep.c

[PATCH v3 0/2] grep.c: teach --only-matching to 'git-grep(1)'

2018-07-03 Thread Taylor Blau
Documentation/git-grep.txt per [2]. An inter-diff is available below, and thanks as always for your review :-). Thanks, Taylor [1]: https://public-inbox.org/git/20180703143820.gc23...@sigill.intra.peff.net/ [2]: https://public-inbox.org/git/xmqq1sckoxk8....@gitster-ct.c.googlers.com/ Tayl

[PATCH v2] grep.c: teach 'git grep --only-matching'

2018-07-04 Thread Taylor Blau
umn offset. The line header and newlines are handled as a special case within the main loop to avoid polluting the surrounding code with conditionals that have large blocks. Signed-off-by: Taylor Blau --- Documentation/git-grep.txt | 6 - builtin/grep.c | 6 + grep.c

Re: [PATCH v2] grep.c: teach 'git grep --only-matching'

2018-07-04 Thread Taylor Blau
On Mon, Jun 25, 2018 at 02:59:07PM -0500, Taylor Blau wrote: > Teach 'git grep --only-matching', a new option to only print the > matching part(s) of a line. > > [ ... ] > > diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt > index 0de349

Re: [PATCH v3 0/2] grep.c: teach --only-matching to 'git-grep(1)'

2018-07-05 Thread Taylor Blau
On Thu, Jul 05, 2018 at 10:21:11AM -0400, Jeff King wrote: > On Tue, Jul 03, 2018 at 04:51:52PM -0500, Taylor Blau wrote: > > > diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt > > index 0de3493b80..be13fc3253 100644 > > --- a/Documentation/git-grep.txt

Re: [PATCH] builtin/config: work around an unsized array forward declaration

2018-07-05 Thread Taylor Blau
On Thu, Jul 05, 2018 at 08:34:45PM +0200, Beat Bolli wrote: > As reported here[0], Microsoft Visual Studio 2017.2 and "gcc -pedantic" > don't understand the forward declaration of an unsized static array. > They insist on an array size: > > d:\git\src\builtin\config.c(70,46): error C2133: > 'b

Re: [PATCH v3 0/2] grep.c: teach --only-matching to 'git-grep(1)'

2018-07-06 Thread Taylor Blau
On Fri, Jul 06, 2018 at 11:21:06AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > I think that this might be clear enough on its own, especially since > > this is the same as BSD grep on my machine. I think that part_s_ of a > > line indicates that behavior, but

[PATCH v4] grep.c: teach 'git grep --only-matching'

2018-07-09 Thread Taylor Blau
umn offset. The line header and newlines are handled as a special case within the main loop to avoid polluting the surrounding code with conditionals that have large blocks. Signed-off-by: Taylor Blau --- Documentation/git-grep.txt | 7 +- builtin/grep.c | 6 + grep.c

Re: [PATCH v4] grep.c: teach 'git grep --only-matching'

2018-07-09 Thread Taylor Blau
On Mon, Jul 09, 2018 at 03:33:47PM -0500, Taylor Blau wrote: > [ ... ] > --- > Documentation/git-grep.txt | 7 +- > builtin/grep.c | 6 + > grep.c | 51 ++ > grep.h | 1 +

Re: [PATCH v2 00/16] object_id part 14

2018-07-16 Thread Taylor Blau
d by one from Ben Peart. > * Update patch handling hash* and oid* functions. Along with Derrick, I also read this series and found it to be without problems. This looks good to me, too. Reviewed-by: Taylor Blau Thanks, Taylor

Re: [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests

2018-07-19 Thread Taylor Blau
On Thu, Jul 19, 2018 at 02:14:09PM +0200, Henning Schild wrote: > Unsetting the varibale for good can have unwanted effects for new s/varibale/variable > tests added in the future It also meant we needed to hardcode the s/future/&. > value for "user.signingkey". > Move the unset into a subshell

[PATCH] builtin/config.c: don't print a newline with --color

2019-03-01 Thread Taylor Blau
nly print a newline when the type is not 'color', and print the escape sequence itself for an exact comparison. Signed-off-by: Taylor Blau --- builtin/config.c | 3 ++- t/t1300-config.sh | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/config.c b/builtin/

Re: [PATCH] builtin/config.c: don't print a newline with --color

2019-03-06 Thread Taylor Blau
On Tue, Mar 05, 2019 at 02:57:32PM +0900, Junio C Hamano wrote: > Yup, that would be a very sensible first step, regardless of what > the next step is. > > After that, choices are > > (1) we'd introduce new inconsistency among --type= by > matching what --type=color does to what --get-color d

Re: [PATCH] builtin/config.c: don't print a newline with --color

2019-03-06 Thread Taylor Blau
Hi Johannes, On Sat, Mar 02, 2019 at 09:25:28PM +0100, Johannes Schindelin wrote: > Hi Taylor, > > On Fri, 1 Mar 2019, Taylor Blau wrote: > > > [ ... ] > > This should do the right thing if you write > > printf "" >expect > > instead? >

[PATCH v2] Documentation/config: note trailing newline with --type=color

2019-03-06 Thread Taylor Blau
. Instead of introducing ambiguity between `--type=color` and the other `--type` variants, document the difference between `--type=color` and `--get-color` instead. Co-authored-by: Jeff King Signed-off-by: Taylor Blau --- Documentation/git-config.txt | 4 +++- 1 file changed, 3 insertions(+), 1

Re: [PATCH 1/2] refs/files-backend: handle packed transaction prepare failure

2019-03-22 Thread Taylor Blau
On Thu, Mar 21, 2019 at 08:06:01PM -0400, Jeff King wrote: > On Thu, Mar 21, 2019 at 05:28:44AM -0400, Jeff King wrote: > > > - instead of disconnecting backend_data->packed_transaction on error, > > we could wait to install it until we successfully prepare. That > > might make the flow a

<    1   2   3   4   5   6   >