summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-14 20:48:31 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-14 20:48:31 -0700
commit19ece726e194f86b8d316d35b65daa92c245453b (patch)
tree0c13f180db74f7bd90c5d2df9d4a7c03a74765ce /t
parentddbca33ca7e08d837ab4faa9a7da563f3f7700aa (diff)
parentf9c75d858d85449a8a6f635bef4b5bd003edd764 (diff)
downloadgit-19ece726e194f86b8d316d35b65daa92c245453b.tar.gz
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
Diffstat (limited to 't')
-rwxr-xr-xt/t7007-show.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7007-show.sh b/t/t7007-show.sh
index a40cd3630c..e41fa00b80 100755
--- 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