Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge branch 'as/grep-fullname-config'
Browse files Browse the repository at this point in the history
Add a configuration variable to force --full-name to be default for
"git grep".

This may cause regressions on scripted users that do not expect
this new behaviour.

* as/grep-fullname-config:
  grep: add grep.fullName config variable
  • Loading branch information
gitster committed Jun 3, 2014
2 parents bce14aa + 6453f7b commit 52df917
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Documentation/git-grep.txt
Expand Up @@ -53,6 +53,9 @@ grep.extendedRegexp::
option is ignored when the 'grep.patternType' option is set to a value
other than 'default'.

grep.fullName::
If set to true, enable '--full-name' option by default.


OPTIONS
-------
Expand Down
5 changes: 5 additions & 0 deletions grep.c
Expand Up @@ -86,6 +86,11 @@ int grep_config(const char *var, const char *value, void *cb)
return 0;
}

if (!strcmp(var, "grep.fullname")) {
opt->relative = !git_config_bool(var, value);
return 0;
}

if (!strcmp(var, "color.grep"))
opt->color = git_config_colorbool(var, value);
else if (!strcmp(var, "color.grep.context"))
Expand Down

0 comments on commit 52df917

Please sign in to comment.