From 3f4b609f5f3146a34eb72e82ab55714328e0bd1a Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Thu, 8 Jan 2009 19:53:01 +0100 Subject: [PATCH 1/2] git-commit: color status output when color.ui is set When using "git commit" and there was nothing to commit (the editor wasn't launched), the status output wasn't colored, even though color.ui was set. Only when setting color.status it worked. Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- builtin-commit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin-commit.c b/builtin-commit.c index e88b78f811..2d90f7430d 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -945,6 +945,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); From 38920dd6d377a82f4c8c51c3451271d6a93c92a8 Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Thu, 8 Jan 2009 19:53:05 +0100 Subject: [PATCH 2/2] git-status -v: color diff output when color.ui is set When using "git status -v", the diff output wasn't colored, even though color.ui was set. Only when setting color.diff it worked. Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- builtin-commit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin-commit.c b/builtin-commit.c index 2d90f7430d..7cf227a1b1 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -866,6 +866,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);