summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-28 19:25:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-28 19:25:24 (GMT)
commit01771a8e2b9f697d1ae4e3d20d9ab86a4aa9e633 (patch)
tree33a7db16f83f1c93d463af4473439447960bf091 /builtin
parent1c40c36b9acbb55726ea0fcf98714a85e159e45f (diff)
downloadgit-01771a8e2b9f697d1ae4e3d20d9ab86a4aa9e633.zip
git-01771a8e2b9f697d1ae4e3d20d9ab86a4aa9e633.tar.gz
git-01771a8e2b9f697d1ae4e3d20d9ab86a4aa9e633.tar.bz2
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/log.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c
index ca35340..4b7f8f4 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)