From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Jan 2009 07:05:19 +0000 (-0800)
Subject: Merge branch 'mh/maint-commit-color-status'
X-Git-Tag: v1.6.2-rc0~143
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f5707f9a9ac9e1f5afe6f415731fb46ea2da8ff?hp=-c

Merge branch 'mh/maint-commit-color-status'

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

8f5707f9a9ac9e1f5afe6f415731fb46ea2da8ff
diff --combined builtin-commit.c
index 977ea09c51,7cf227a1b1..2f0b00a174
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@@ -624,6 -624,7 +624,6 @@@ static int prepare_to_commit(const cha
  	if (!commitable && !in_merge && !allow_empty &&
  	    !(amend && is_a_merge(head_sha1))) {
  		run_status(stdout, index_file, prefix, 0);
 -		unlink(commit_editmsg);
  		return 0;
  	}
  
@@@ -865,6 -866,9 +865,9 @@@ int cmd_status(int argc, const char **a
  	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 -948,9 +947,9 @@@ int cmd_commit(int argc, const char **a
  
  	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);