diff options
| author | Joe Ratterman <jratt0@gmail.com> | 2011-03-30 19:31:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-30 20:17:07 (GMT) |
| commit | b22520a37c8472751f2c4b3da9b5bc4e5aa5a0a3 (patch) | |
| tree | 2cc115af941794b8d634345098f0d54512f42ccc /t | |
| parent | 61e8aaf6215a2983610a770645e6d0a24bafb454 (diff) | |
| download | git-b22520a37c8472751f2c4b3da9b5bc4e5aa5a0a3.zip git-b22520a37c8472751f2c4b3da9b5bc4e5aa5a0a3.tar.gz git-b22520a37c8472751f2c4b3da9b5bc4e5aa5a0a3.tar.bz2 | |
grep: allow -E and -n to be turned on by default via configuration
Add two configration variables grep.extendedRegexp and grep.lineNumbers to
allow the user to skip typing -E and -n on the command line, respectively.
Scripts that are meant to be used by random users and/or in random
repositories now have use -G and/or --no-line-number options as
appropriately to override the settings in the repository or user's
~/.gitconfig settings. Just because the script didn't say "git grep -n" no
longer guarantees that the output from the command will not have line
numbers.
Signed-off-by: Joe Ratterman <jratt0@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7810-grep.sh | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index dbc6cd8..8184c26 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -59,7 +59,29 @@ do echo ${HC}file:4:foo mmap bar_mmap echo ${HC}file:5:foo_mmap bar mmap baz } >expected && - git grep -n -w -e mmap $H >actual && + git -c grep.linenumber=false grep -n -w -e mmap $H >actual && + test_cmp expected actual + ' + + test_expect_success "grep -w $L" ' + { + echo ${HC}file:1:foo mmap bar + echo ${HC}file:3:foo_mmap bar mmap + echo ${HC}file:4:foo mmap bar_mmap + echo ${HC}file:5:foo_mmap bar mmap baz + } >expected && + git -c grep.linenumber=true grep -w -e mmap $H >actual && + test_cmp expected actual + ' + + test_expect_success "grep -w $L" ' + { + echo ${HC}file:foo mmap bar + echo ${HC}file:foo_mmap bar mmap + echo ${HC}file:foo mmap bar_mmap + echo ${HC}file:foo_mmap bar mmap baz + } >expected && + git -c grep.linenumber=true grep --no-line-number -w -e mmap $H >actual && test_cmp expected actual ' |