From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Jan 2009 07:42:53 +0000 (-0800)
Subject: Merge branch 'mh/maint-commit-color-status' into maint
X-Git-Tag: v1.6.1.2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0630a66f8a043018604c5eb48e2c6881bd6c95e5?hp=f9686cdc23f143abe111c15c22dd1c2b3c33fd67

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
---

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);