log: --quiet should serve as synonym to -s

The previous commit simply hijacked --quiet and essentially made it into a
no-op. Instead, take it as a cue that the end user wants to omit the patch
output from commands that default to show patches, e.g. "show".

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/log.c b/builtin/log.c
index ca353402a6984b6fc122c712173f4f061dd5bf20..4b7f8f47f353dc3da942fb4348ab21a8b20620fb 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -102,6 +102,8 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
                rev->date_mode = parse_date_format(default_date_mode);
 
        argc = setup_revisions(argc, argv, rev, opt);
+       if (quiet)
+               rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
 
        /* Any arguments at this point are not recognized */
        if (argc > 1)