mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
0630a66f8a
|
@ -865,6 +865,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
||||||
if (wt_status_use_color == -1)
|
if (wt_status_use_color == -1)
|
||||||
wt_status_use_color = git_use_color_default;
|
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);
|
argc = parse_and_validate_options(argc, argv, builtin_status_usage, prefix);
|
||||||
|
|
||||||
index_file = prepare_index(argc, argv, 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);
|
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);
|
argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix);
|
||||||
|
|
||||||
index_file = prepare_index(argc, argv, prefix);
|
index_file = prepare_index(argc, argv, prefix);
|
||||||
|
|
Loading…
Reference in a new issue