* [PATCH] Fix diff-tree -s
@ 2006-06-27 16:43 Timo Hirvonen
0 siblings, 0 replies; only message in thread
From: Timo Hirvonen @ 2006-06-27 16:43 UTC (permalink / raw)
To: junkio; +Cc: git
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>
---
diff.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 2c47f11..9b8a6e5 100644
--- a/diff.c
+++ b/diff.c
@@ -1385,9 +1385,6 @@ int diff_setup_done(struct diff_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 |
--
1.4.1.rc1.g1ef9
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-06-27 16:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-27 16:43 [PATCH] Fix diff-tree -s Timo Hirvonen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox