diff options
| author | Matthias Kestenholz <mk@spinlock.ch> | 2008-02-18 08:26:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-18 00:00:38 -0800 |
| commit | 6b2f2d9805dd22c6f74957e0d76a1d2921b40c16 (patch) | |
| tree | 04abc994611f31c778738577db1e83bd9a979835 /builtin-branch.c | |
| parent | cf5c51efc9fe3b0ef93c7b78005c57b71acaf959 (diff) | |
| download | git-6b2f2d9805dd22c6f74957e0d76a1d2921b40c16.tar.gz git-6b2f2d9805dd22c6f74957e0d76a1d2921b40c16.tar.xz | |
Add color.ui variable which globally enables colorization if set
Signed-off-by: Matthias Kestenholz <mk@spinlock.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index e414c8898..9edf2eb81 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -31,7 +31,7 @@ static unsigned char head_sha1[20]; static int branch_track = 1; -static int branch_use_color; +static int branch_use_color = -1; static char branch_colors[][COLOR_MAXLEN] = { "\033[m", /* reset */ "", /* PLAIN (normal) */ @@ -79,12 +79,12 @@ static int git_branch_config(const char *var, const char *value) branch_track = git_config_bool(var, value); return 0; } - return git_default_config(var, value); + return git_color_default_config(var, value); } static const char *branch_get_color(enum color_branch ix) { - if (branch_use_color) + if (branch_use_color > 0) return branch_colors[ix]; return ""; } @@ -588,6 +588,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix) }; git_config(git_branch_config); + + if (branch_use_color == -1) + branch_use_color = git_use_color_default; + track = branch_track; argc = parse_options(argc, argv, options, builtin_branch_usage, 0); if (!!delete + !!rename + !!force_create > 1) |