{"thread":{"id":"4683","subject":"[PATCH] Fix diff-tree -s","startedAt":"2006-06-27T16:43:22Z","lastAt":"2006-06-27T16:43:22Z","messageCount":1,"participants":["Timo Hirvonen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"22674","messageId":"20060627194322.3608050a.tihirvon@gmail.com","threadId":"4683","inReplyTo":null,"subject":"[PATCH] Fix diff-tree -s","fromName":"Timo Hirvonen","fromEmail":"tihirvon@gmail.com","sentAt":"2006-06-27T16:43:22Z","receivedAt":"2006-06-27T16:43:22Z","isPatch":true,"sender":{"key":"tihirvon@gmail.com","avatar":null},"body":"setup_revisions() calls diff_setup_done() before we can set default\nvalue for output_format.  Don't convert DIFF_FORMAT_NO_OUTPUT to 0 in\ndiff_setup_done(), it is useless and makes diff-tree believe no diff\nformat parameters were given and thus lets it reset output_format to\nDIFF_FORMAT_RAW.\n\nSigned-off-by: Timo Hirvonen <tihirvon@gmail.com>\n---\n diff.c |    3 ---\n 1 files changed, 0 insertions(+), 3 deletions(-)\n\ndiff --git a/diff.c b/diff.c\nindex 2c47f11..9b8a6e5 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -1385,9 +1385,6 @@ int diff_setup_done(struct diff_options \n \t    (0 <= options->rename_limit && !options->detect_rename))\n \t\treturn -1;\n \n-\tif (options->output_format & DIFF_FORMAT_NO_OUTPUT)\n-\t\toptions->output_format = 0;\n-\n \tif (options->output_format & (DIFF_FORMAT_NAME |\n \t\t\t\t      DIFF_FORMAT_NAME_STATUS |\n \t\t\t\t      DIFF_FORMAT_CHECKDIFF |\n-- \n1.4.1.rc1.g1ef9\n"}]}