kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11 

* jk/maint-quiet-is-synonym-to-s-in-log:
  log: fix --quiet synonym for -s
maint
Junio C Hamano 2012-09-14 20:48:31 -07:00
parent ddbca33ca7 f9c75d858d
commit 19ece726e1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/log.c
View File

@ -108,9 +108,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_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
PARSE_OPT_KEEP_DASHDASH); PARSE_OPT_KEEP_DASHDASH);


argc = setup_revisions(argc, argv, rev, opt);
if (quiet) if (quiet)
rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT; rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
argc = setup_revisions(argc, argv, rev, opt);


/* Any arguments at this point are not recognized */ /* Any arguments at this point are not recognized */
if (argc > 1) if (argc > 1)

12
t/t7007-show.sh
View File

@ -108,4 +108,16 @@ test_expect_success 'showing range' '
test_cmp expect actual.filtered 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 test_done