diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-20 16:13:56 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-20 16:13:56 -0800 |
commit | b23b27eb5dc950081d4f76ae84f10168c4d149bd (patch) | |
tree | 6e29309bd8f2ae4b200214a0d2257aa1bc909515 /builtin-commit.c | |
parent | 6fe870f032e4a247cdcf2949bb24d103873ff597 (diff) | |
parent | 6b2f2d9805dd22c6f74957e0d76a1d2921b40c16 (diff) | |
download | git-b23b27eb5dc950081d4f76ae84f10168c4d149bd.tar.gz |
Merge branch 'mk/color'
* mk/color:
Add color.ui variable which globally enables colorization if set
Diffstat (limited to 'builtin-commit.c')
-rw-r--r-- | builtin-commit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 6612b4f405..065e1f7b7f 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -7,6 +7,7 @@ #include "cache.h" #include "cache-tree.h" +#include "color.h" #include "dir.h" #include "builtin.h" #include "diff.h" @@ -771,6 +772,9 @@ int cmd_status(int argc, const char **argv, const char *prefix) git_config(git_status_config); + if (wt_status_use_color == -1) + wt_status_use_color = git_use_color_default; + argc = parse_and_validate_options(argc, argv, builtin_status_usage); index_file = prepare_index(argc, argv, prefix); |