[PATCH v3] grep: allow -E and -n to be turned on by default via configuration
- From
Joe Ratterman <jratt0@gmail.com>
- Date
- Mar 30, 2011, 19:31 UTC
- Message-ID
- <1301513465-15357-1-git-send-email-jratt0@gmail.com>
- In-Reply-To
- <AANLkTikpjoyPWYomKsi0YA=KrcPU2Qxn0dBgjbUi2B_x@mail.gmail.com>
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> ---
This adds 3 tests to t7810-grep.sh: 1) git -c grep.linenumber=false grep -n # Expected to have line numbers 2) git -c grep.linenumber=true grep # Expected to have line numbers 3) git -c grep.linenumber=true grep --no-line-number # Expected to have no line numbers
Documentation/config.txt | 6 ++++++ Documentation/git-grep.txt | 10 ++++++++++ builtin/grep.c | 13 +++++++++++++ t/t7810-grep.sh | 24 +++++++++++++++++++++++- 4 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt index 701fba9..c63458d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1092,6 +1092,12 @@ All gitcvs variables except for 'gitcvs.usecrlfattr' and is one of "ext" and "pserver") to make them apply only for the given access method. +grep.lineNumber:: + If set to true, enable '-n' option by default. + +grep.extendedRegexp:: + If set to true, enable '--extended-regexp' option by default. + gui.commitmsgwidth:: Defines how wide the commit message window is in the linkgit:git-gui[1]. "75" is the default. diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 791d4d4..16a0466 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -31,6 +31,16 @@ Look for specified patterns in the tracked files in the work tree, blobs registered in the index file, or blobs in given tree objects. +CONFIGURATION +------------- + +grep.lineNumber:: + If set to true, enable '-n' option by default. + +grep.extendedRegexp:: + If set to true, enable '--extended-regexp' option by default. + + OPTIONS ------- --cached:: diff --git a/builtin/grep.c b/builtin/grep.c index bb0f932..dcc5a76 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -302,6 +302,19 @@ static int grep_config(const char *var, const char *value, void *cb) default: return 0; } + if (!strcmp(var, "grep.extendedregexp")) { + if (git_config_bool(var, value)) + opt->regflags |= REG_EXTENDED; + else + opt->regflags &= ~REG_EXTENDED; + return 0; + } + + if (!strcmp(var, "grep.linenumber")) { + opt->linenum = git_config_bool(var, value); + return 0; + } + if (!strcmp(var, "color.grep")) opt->color = git_config_colorbool(var, value, -1); else if (!strcmp(var, "color.grep.context")) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index c877758..be95bb2 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 '
-- 1.7.4.1.4.g0ea33