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 /log-tree.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 'log-tree.c')
| -rw-r--r-- | log-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c index e9457019d5..95d6d4080e 100644 --- a/log-tree.c +++ b/log-tree.c @@ -31,7 +31,7 @@ static char decoration_colors[][COLOR_MAXLEN] = { static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix) { - if (decorate_use_color) + if (want_color(decorate_use_color)) return decoration_colors[ix]; return ""; } @@ -77,7 +77,7 @@ int parse_decorate_color_config(const char *var, const int ofs, const char *valu * for showing the commit sha1, use the same check for --decorate */ #define decorate_get_color_opt(o, ix) \ - decorate_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix) + decorate_get_color((o)->use_color, ix) static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj) { |