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 --combined builtin-commit.c
index 977ea09c51269e897ea09ceb4060661a0278e515,7cf227a1b152df7a4a06b4fe546d7f7cb1a47ae0..2f0b00a174ff970939d2758334cb8d1dca41cb42
--- 1/builtin-commit.c
--- 2/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);