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

[Taylor Blau <me@ttaylorr.com>]

On Wed, May 30, 2018 at 03:38:09PM +0900, Junio C Hamano wrote:
> * tb/grep-column (2018-05-14) 7 commits
>  - contrib/git-jump/git-jump: jump to match column in addition to line
>  - grep.c: add configuration variables to show matched option
>  - builtin/grep.c: add '--column' option to 'git-grep(1)'
>  - grep.c: display column number of first match
>  - grep.[ch]: extend grep_opt to allow showing matched column
>  - grep.c: expose matched column in match_line()
>  - Documentation/config.txt: camel-case lineNumber for consistency
>  (this branch is used by tb/grep-only-matching.)
>
>  "git grep" learned the "--column" option that gives not just the
>  line number but the column number of the hit.

The last we spoke about this, we had decided on a "min-starting,
max-ending" semantics for deciding on the columnar offset for extended
patterns like --and, --or, and --not.

I have these patches mostly updated on my copy (available at
https://github.com/ttaylorr/git/compare/tb/grep-column) but am out of
the office for the next week, so I will polish and send these on June
8th.

> * tb/grep-only-matching (2018-05-14) 2 commits
>  - builtin/grep.c: teach '-o', '--only-matching' to 'git-grep'
>  - grep.c: extract show_line_header()
>  (this branch uses tb/grep-column.)

This topic is done, but will be frustrating to merge after the changes
in tb/grep-column. I'll update this topic once tb/grep-column graduates
to master, that way they will both apply cleanly.


Thanks,
Taylor