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

2018-06-22 Thread Jeff King
On Fri, Jun 22, 2018 at 11:45:09PM +0200, Johannes Schindelin wrote: > > This might be a candidate for another "weather balloon" patch to see if > > anybody complains, though. The last time time we dealt with this in a > > major way was over 7 years ago in 28bd70d811 (unbreak and eliminate > >

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

2018-06-22 Thread Johannes Schindelin
Hi Peff, On Thu, 21 Jun 2018, Jeff King wrote: > On Thu, Jun 21, 2018 at 07:53:02AM -0400, Jeff King wrote: > > > > @@ -1429,7 +1447,7 @@ static void show_line(struct grep_opt *opt, char > > > *bol, char *eol, > > >*/ > > > if (opt->columnnum && cno) { > > > char buf[32]; > > >

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

2018-06-22 Thread Jeff King
On Thu, Jun 21, 2018 at 04:45:49PM -0500, Taylor Blau wrote: > > but not this: > > > > $ ./git grep --column -v --not -e scalable --and --not -e fast -- > > README.md > > README.md:13:Git - fast, scalable, distributed revision control system > > README.md:16:Git is a fast, scalable,

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 than the following: > > > > - Fix a typo

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

2018-06-21 Thread Junio C Hamano
Jeff King writes: > I wasn't sure where we landed in the discussion on "how much crazy stuff > to support". But AFAIK, the code in this iteration handles every crazy > case already except this one. If we're going to care about OR, maybe we > should just cover all cases. I think I was the only

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

2018-06-21 Thread Jeff King
On Thu, Jun 21, 2018 at 07:53:02AM -0400, Jeff King wrote: > > @@ -1429,7 +1447,7 @@ static void show_line(struct grep_opt *opt, char > > *bol, char *eol, > > */ > > if (opt->columnnum && cno) { > > char buf[32]; > > - xsnprintf(buf, sizeof(buf), "%d", cno); > > +

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

2018-06-21 Thread Jeff King
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 than the following: > > - Fix a typo where 'col', 'icol' were spelled as 'match', 'imatch' > [1]. > > -

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

2018-06-20 Thread Taylor Blau
Hi, Here is a re-roll of my series to add --column to 'git-grep(1)'. Since last time, not much has changed other than the following: - Fix a typo where 'col', 'icol' were spelled as 'match', 'imatch' [1]. - Disable short-circuiting OR when --column is given [2]. - Disable