summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-10 22:42:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-10 22:42:48 (GMT)
commit1c0712dea8fd927faa49fe494f507d18f0d41264 (patch)
tree364ec91c8754a32dfd3b93232281b44f3d111186 /builtin/log.c
parent7ff38b0847a641970a30cdfdae30f97afc233ea9 (diff)
parentf9c75d858d85449a8a6f635bef4b5bd003edd764 (diff)
downloadgit-1c0712dea8fd927faa49fe494f507d18f0d41264.zip
git-1c0712dea8fd927faa49fe494f507d18f0d41264.tar.gz
git-1c0712dea8fd927faa49fe494f507d18f0d41264.tar.bz2
Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'
We tried to bend backwards to allow "--quiet" to be a synonym as "-s" when given as e.g. "git show --quiet", but did not quite succeed. * jk/maint-quiet-is-synonym-to-s-in-log: log: fix --quiet synonym for -s
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index d76f359..e4e15dd 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -109,9 +109,9 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
PARSE_OPT_KEEP_DASHDASH);
- argc = setup_revisions(argc, argv, rev, opt);
if (quiet)
rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
+ argc = setup_revisions(argc, argv, rev, opt);
/* Any arguments at this point are not recognized */
if (argc > 1)