summaryrefslogtreecommitdiff
path: root/builtin-commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-15 09:14:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-15 09:33:21 (GMT)
commit3fa509dfbdb8526453f4213f79b371bdfa493f0e (patch)
tree00310cf107369aef0e5e57a35b5e58bc0f93e018 /builtin-commit.c
parent60c2993c92fa1aa7f4d4aab7de6d8769052ced6f (diff)
downloadgit-3fa509dfbdb8526453f4213f79b371bdfa493f0e.zip
git-3fa509dfbdb8526453f4213f79b371bdfa493f0e.tar.gz
git-3fa509dfbdb8526453f4213f79b371bdfa493f0e.tar.bz2
git commit --dry-run -v: show diff in color when asked
The earlier implementation of --dry-run didn't duplicate the use of color "git status -v" set up for diff output. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit.c')
-rw-r--r--builtin-commit.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index 1c200eb..200ffda 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -979,9 +979,11 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
argc = parse_and_validate_options(argc, argv, builtin_commit_usage,
prefix, &s);
- if (dry_run)
+ if (dry_run) {
+ if (diff_use_color_default == -1)
+ diff_use_color_default = git_use_color_default;
return dry_run_commit(argc, argv, prefix, &s);
-
+ }
index_file = prepare_index(argc, argv, prefix, 0);
/* Set up everything for writing the commit object. This includes