Taylor Blau <me@xxxxxxxxxxxx> writes:
> * Removed '-m' as an alias for '--column-number', per René's
> suggestion [1].
>
> * Fix some incorrect spelling of 'columnnumber'.
>
> * Change casing of 'color.grep.linenumber' to 'color.grep.lineNumber'
> to be consistent with 'color.grep.columnNumber'. This is an
> unrelated change, and one which I am happy to drop from this series.
> It was suggested by Martin in [2].
All sounds like good updates.
> diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
> index 0cf654824d..7349c7fadc 100755
> --- a/t/t7810-grep.sh
> +++ b/t/t7810-grep.sh
> @@ -106,7 +106,7 @@ do
> echo ${HC}file:5:foo mmap bar_mmap
> echo ${HC}file:14:foo_mmap bar mmap baz
> } >expected &&
> - git -c grep.linenumber=false grep -m -w -e mmap $H >actual &&
> + git grep --column-number -w -e mmap $H >actual &&
> test_cmp expected actual
> '
>
> @@ -117,7 +117,7 @@ do
> echo ${HC}file:4:5:foo mmap bar_mmap
> echo ${HC}file:5:14:foo_mmap bar mmap baz
> } >expected &&
> - git -c grep.linenumber=false grep -n -m -w -e mmap $H >actual &&
> + git grep -n --column-number -w -e mmap $H >actual &&
> test_cmp expected actual
> '
It seems that these two used to be "even when it is configured not
to show linenumber, with -n it is shown and without -n it is not,
when the new --column-number feature forces the command to show the
"filename plus colon plus location info plus coon" header. I'm
guessing that the reason why these got changed this round is because
the old way was found too defensive (perhaps nobody sets
grep.linenumber in .git/config in the tests that come before these)?
