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/branch.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 'builtin/branch.c')
-rw-r--r-- | builtin/branch.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 953bc1ca9b..f7da69c932 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -71,7 +71,7 @@ static int parse_branch_color_slot(const char *var, int ofs) static int git_branch_config(const char *var, const char *value, void *cb) { if (!strcmp(var, "color.branch")) { - branch_use_color = git_config_colorbool(var, value, -1); + branch_use_color = git_config_colorbool(var, value); return 0; } if (!prefixcmp(var, "color.branch.")) { @@ -88,7 +88,7 @@ static int git_branch_config(const char *var, const char *value, void *cb) static const char *branch_get_color(enum color_branch ix) { - if (branch_use_color > 0) + if (want_color(branch_use_color)) return branch_colors[ix]; return ""; } @@ -673,9 +673,6 @@ int cmd_branch(int argc, const char **argv, const char *prefix) git_config(git_branch_config, NULL); - if (branch_use_color == -1) - branch_use_color = git_use_color_default; - track = git_branch_track; head = resolve_ref("HEAD", head_sha1, 0, NULL); |