diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:16 -0700 |
| commit | f946b465d7fa13a235dd5653d37c7babb1ceb233 (patch) | |
| tree | d3a1aa2e6f0779e5440cec0815f0d59d9e31b4d4 /builtin/grep.c | |
| parent | e5cfcb04e0acc5f3b51e6d69487028315b33e4c9 (diff) | |
| parent | c9bfb953489e559d513c1627150aa16f8d42d6c5 (diff) | |
| download | git-f946b465d7fa13a235dd5653d37c7babb1ceb233.tar.gz git-f946b465d7fa13a235dd5653d37c7babb1ceb233.tar.xz | |
Merge branch 'jk/color-and-pager'
* jk/color-and-pager:
want_color: automatically fallback to color.ui
diff: don't load color config in plumbing
config: refactor get_colorbool function
color: delay auto-color decision until point of use
git_config_colorbool: refactor stdout_is_tty handling
diff: refactor COLOR_DIFF from a flag into an int
setup_pager: set GIT_PAGER_IN_USE
t7006: use test_config helpers
test-lib: add helper functions for config
t7006: modernize calls to unset
Conflicts:
builtin/commit.c
parse-options.c
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 185179754..1c359c267 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -325,7 +325,7 @@ static int grep_config(const char *var, const char *value, void *cb) } if (!strcmp(var, "color.grep")) - opt->color = git_config_colorbool(var, value, -1); + opt->color = git_config_colorbool(var, value); else if (!strcmp(var, "color.grep.context")) color = opt->color_context; else if (!strcmp(var, "color.grep.filename")) @@ -898,8 +898,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix) strcpy(opt.color_sep, GIT_COLOR_CYAN); opt.color = -1; git_config(grep_config, &opt); - if (opt.color == -1) - opt.color = git_use_color_default; /* * If there is no -- then the paths must exist in the working |