Skip to content

Commit

Permalink
Fix diff-tree -s
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Timo Hirvonen authored and Junio C Hamano committed Jun 27, 2006
1 parent 1798562 commit 3223847
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down

0 comments on commit 3223847

Please sign in to comment.