Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git commit --dry-run -v: show diff in color when asked
author
Junio C Hamano
<gitster@pobox.com>
Sat, 15 Aug 2009 09:14:14 +0000
(
02:14
-0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 15 Aug 2009 09:33:21 +0000
(
02:33
-0700)
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>
builtin-commit.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
60c2993
)
diff --git
a/builtin-commit.c
b/builtin-commit.c
index 1c200eb9631c983dbde1a150497b0308eb1809d4..200ffdaad4226ae2021c86ae4b7a2f8ccefb3600 100644
(file)
--- 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