diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-18 07:05:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-18 07:05:19 (GMT) |
| commit | 8f5707f9a9ac9e1f5afe6f415731fb46ea2da8ff (patch) | |
| tree | b127791a11f113c49e5de2ed02bac19fd0f08237 /builtin-commit.c | |
| parent | 58f37f3c07ef4869f88c79b61f11829bebf7bf40 (diff) | |
| parent | 38920dd6d377a82f4c8c51c3451271d6a93c92a8 (diff) | |
| download | git-8f5707f9a9ac9e1f5afe6f415731fb46ea2da8ff.zip git-8f5707f9a9ac9e1f5afe6f415731fb46ea2da8ff.tar.gz git-8f5707f9a9ac9e1f5afe6f415731fb46ea2da8ff.tar.bz2 | |
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
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 977ea09..2f0b00a 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); |