From: Junio C Hamano Date: Sat, 28 May 2011 19:25:24 +0000 (-0700) Subject: log: --quiet should serve as synonym to -s X-Git-Tag: v1.7.6-rc0~6^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01771a8e2b9f697d1ae4e3d20d9ab86a4aa9e633;p=git.git 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 --- diff --git a/builtin/log.c b/builtin/log.c index ca353402a..4b7f8f47f 100644 --- 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)