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>
This commit is contained in:
Junio C Hamano 2009-08-15 02:14:14 -07:00
Родитель 60c2993c92
Коммит 3fa509dfbd
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -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, argc = parse_and_validate_options(argc, argv, builtin_commit_usage,
prefix, &s); 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); return dry_run_commit(argc, argv, prefix, &s);
}
index_file = prepare_index(argc, argv, prefix, 0); index_file = prepare_index(argc, argv, prefix, 0);
/* Set up everything for writing the commit object. This includes /* Set up everything for writing the commit object. This includes