summaryrefslogtreecommitdiff
path: root/builtin-commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-28 23:42:53 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-28 23:42:53 -0800
commit0630a66f8a043018604c5eb48e2c6881bd6c95e5 (patch)
treebe9f9ea7711e7c831c5941d3ffd1c331437ff251 /builtin-commit.c
parentf9686cdc23f143abe111c15c22dd1c2b3c33fd67 (diff)
parent38920dd6d377a82f4c8c51c3451271d6a93c92a8 (diff)
downloadgit-0630a66f8a043018604c5eb48e2c6881bd6c95e5.tar.gz
Merge branch 'mh/maint-commit-color-status' into maint
* mh/maint-commit-color-status: git-status -v: color diff output when color.ui is set git-commit: color status output when color.ui is set
Diffstat (limited to 'builtin-commit.c')
-rw-r--r--builtin-commit.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index 977ea09c51..2f0b00a174 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -865,6 +865,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)
if (wt_status_use_color == -1)
wt_status_use_color = git_use_color_default;
+ if (diff_use_color_default == -1)
+ diff_use_color_default = git_use_color_default;
+
argc = parse_and_validate_options(argc, argv, builtin_status_usage, prefix);
index_file = prepare_index(argc, argv, prefix);
@@ -944,6 +947,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
git_config(git_commit_config, NULL);
+ if (wt_status_use_color == -1)
+ wt_status_use_color = git_use_color_default;
+
argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix);
index_file = prepare_index(argc, argv, prefix);