Fix diff-tree -s
setup_revisions() calls diff_setup_done() before we can set default value for output_format. Don't convert DIFF_FORMAT_NO_OUTPUT to 0 in diff_setup_done(), it is useless and makes diff-tree believe no diff format parameters were given and thus lets it reset output_format to DIFF_FORMAT_RAW. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Timo Hirvonen committed
Jun 27, 2006 at 19:43 UTC
3223847a8fbd6200e38f4a8f1146ca9dc20a813e
1 file changed
-3
diff.c
-3
@@ -1438,9 +1438,6 @@ int diff_setup_done(struct diff_options *options)
1438
(0 <= options->rename_limit && !options->detect_rename))
1439
return -1;
1440
1441
- if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
1442
- options->output_format = 0;
1443
-
1441
if (options->output_format & (DIFF_FORMAT_NAME |
1442
DIFF_FORMAT_NAME_STATUS |
1443
DIFF_FORMAT_CHECKDIFF |