From: Timo Hirvonen <tihirvon@gmail.com>
Date: Tue, 27 Jun 2006 16:43:22 +0000 (+0300)
Subject: Fix diff-tree -s
X-Git-Tag: v1.4.2-rc1~85^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3223847a8fbd6200e38f4a8f1146ca9dc20a813e;p=git.git

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>
---

diff --git a/diff.c b/diff.c
index 71fb0967f..6d04be49d 100644
--- a/diff.c
+++ b/diff.c
@@ -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 |