Set default diff output format after parsing command line

Initialize output_format to 0 instead of DIFF_FORMAT_RAW so that we can see
later if any command line options changed it.  Default value is set only if
output format was not specified.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Timo Hirvonen 2006-06-24 20:24:14 +03:00 коммит произвёл Junio C Hamano
Родитель a610786f4b
Коммит c9b5ef998a
7 изменённых файлов: 18 добавлений и 3 удалений

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

@ -36,6 +36,9 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
usage(diff_files_usage); usage(diff_files_usage);
argv++; argc--; argv++; argc--;
} }
if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_RAW;
/* /*
* Make sure there are NO revision (i.e. pending object) parameter, * Make sure there are NO revision (i.e. pending object) parameter,
* rev.max_count is reasonable (0 <= n <= 3), * rev.max_count is reasonable (0 <= n <= 3),

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

@ -28,6 +28,9 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
else else
usage(diff_cache_usage); usage(diff_cache_usage);
} }
if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_RAW;
/* /*
* Make sure there is one revision (i.e. pending object), * Make sure there is one revision (i.e. pending object),
* and there is no revision filtering parameters. * and there is no revision filtering parameters.

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

@ -85,6 +85,9 @@ int cmd_diff_stages(int ac, const char **av, char **envp)
ac--; av++; ac--; av++;
} }
if (!diff_options.output_format)
diff_options.output_format = DIFF_FORMAT_RAW;
if (ac < 3 || if (ac < 3 ||
sscanf(av[1], "%d", &stage1) != 1 || sscanf(av[1], "%d", &stage1) != 1 ||
! (0 <= stage1 && stage1 <= 3) || ! (0 <= stage1 && stage1 <= 3) ||

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

@ -84,6 +84,9 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
usage(diff_tree_usage); usage(diff_tree_usage);
} }
if (!opt->diffopt.output_format)
opt->diffopt.output_format = DIFF_FORMAT_RAW;
/* /*
* NOTE! We expect "a ^b" to be equal to "a..b", so we * NOTE! We expect "a ^b" to be equal to "a..b", so we
* reverse the order of the objects if the second one * reverse the order of the objects if the second one

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

@ -252,9 +252,11 @@ int cmd_diff(int argc, const char **argv, char **envp)
git_config(git_diff_config); git_config(git_diff_config);
init_revisions(&rev); init_revisions(&rev);
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
argc = setup_revisions(argc, argv, &rev, NULL); argc = setup_revisions(argc, argv, &rev, NULL);
if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
/* Do we have --cached and not have a pending object, then /* Do we have --cached and not have a pending object, then
* default to HEAD by hand. Eek. * default to HEAD by hand. Eek.
*/ */

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

@ -178,7 +178,6 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
rev.diff = 1; rev.diff = 1;
rev.combine_merges = 0; rev.combine_merges = 0;
rev.ignore_merges = 1; rev.ignore_merges = 1;
rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
git_config(git_format_config); git_config(git_format_config);
rev.extra_headers = extra_headers; rev.extra_headers = extra_headers;
@ -247,6 +246,9 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
if (argc > 1) if (argc > 1)
die ("unrecognized argument: %s", argv[1]); die ("unrecognized argument: %s", argv[1]);
if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
if (output_directory) { if (output_directory) {
if (use_stdout) if (use_stdout)
die("standard output, or directory, which one?"); die("standard output, or directory, which one?");

1
diff.c
Просмотреть файл

@ -1420,7 +1420,6 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
void diff_setup(struct diff_options *options) void diff_setup(struct diff_options *options)
{ {
memset(options, 0, sizeof(*options)); memset(options, 0, sizeof(*options));
options->output_format = DIFF_FORMAT_RAW;
options->line_termination = '\n'; options->line_termination = '\n';
options->break_opt = -1; options->break_opt = -1;
options->rename_limit = -1; options->rename_limit = -1;