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 /parse-options-cb.c | |
| parent | e5cfcb04e0acc5f3b51e6d69487028315b33e4c9 (diff) | |
| parent | c9bfb953489e559d513c1627150aa16f8d42d6c5 (diff) | |
| download | git-f946b465d7fa13a235dd5653d37c7babb1ceb233.tar.gz | |
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 'parse-options-cb.c')
| -rw-r--r-- | parse-options-cb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/parse-options-cb.c b/parse-options-cb.c index c248f667c1..6db0921fc1 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -40,7 +40,7 @@ int parse_opt_color_flag_cb(const struct option *opt, const char *arg, if (!arg) arg = unset ? "never" : (const char *)opt->defval; - value = git_config_colorbool(NULL, arg, -1); + value = git_config_colorbool(NULL, arg); if (value < 0) return opterror(opt, "expects \"always\", \"auto\", or \"never\"", 0); |