OSDN Git Service

git commit --dry-run -v: show diff in color when asked
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Aug 2009 09:14:14 +0000 (02:14 -0700)
committerJunio 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

index 1c200eb..200ffda 100644 (file)
@@ -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