diff options
| author | Timo Hirvonen <tihirvon@gmail.com> | 2006-06-27 20:43:22 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-27 22:04:47 +0400 |
| commit | 3223847a8fbd6200e38f4a8f1146ca9dc20a813e (patch) | |
| tree | 98b247dbe143ef3055f331dacbcd019df6c53bb8 /diff.c | |
| parent | 17985627455901b6ae3a471b67d46239463cebb5 (diff) | |
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>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1438,9 +1438,6 @@ int diff_setup_done(struct diff_options *options) (0 <= options->rename_limit && !options->detect_rename)) return -1; - if (options->output_format & DIFF_FORMAT_NO_OUTPUT) - options->output_format = 0; - if (options->output_format & (DIFF_FORMAT_NAME | DIFF_FORMAT_NAME_STATUS | DIFF_FORMAT_CHECKDIFF | |