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

diff --git a/builtin/log.c b/builtin/log.c
index d76f359440f9c7a5725bbe0baae0fb7835204c9d..e4e15dd55aef5b1cbcb8ddeae6432e6188ff8e4a 100644 (file)
--- 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)

diff --git a/t/t7007-show.sh b/t/t7007-show.sh
index a40cd3630c28a13f4e0f36ef9f56925d3c8579ed..e41fa00b80e9b3eb47e45be848397ccda0f47c53 100755 (executable)
--- a/t/t7007-show.sh
+++ b/t/t7007-show.sh
@@ -108,4 +108,16 @@ test_expect_success 'showing range' '
        test_cmp expect actual.filtered
 '
 
+test_expect_success '-s suppresses diff' '
+       echo main3 >expect &&
+       git show -s --format=%s main3 >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '--quiet suppresses diff' '
+       echo main3 >expect &&
+       git show --quiet --format=%s main3 >actual &&
+       test_cmp expect actual
+'
+
 test_done