merge/pull: verify GPG signatures of commits being merged

diff --git a/t/t7007-show.sh b/t/t7007-show.sh
index 891b143e0cb00e704e788c2ea4e1c5d64665d8fd..e41fa00b80e9b3eb47e45be848397ccda0f47c53 100755 (executable)
--- a/t/t7007-show.sh
+++ b/t/t7007-show.sh
@@ -57,7 +57,7 @@ test_expect_success 'showing a range walks (Y shape, ^ first)' '
        test_cmp expect actual.filtered
 '
 
-test_expect_failure 'showing a range walks (Y shape, ^ last)' '
+test_expect_success 'showing a range walks (Y shape, ^ last)' '
        cat >expect <<-EOF &&
        commit $(git rev-parse main3)
        commit $(git rev-parse main2)
@@ -98,7 +98,7 @@ test_expect_success 'showing annotated tag plus commit' '
        test_cmp expect actual.filtered
 '
 
-test_expect_failure 'showing range' '
+test_expect_success 'showing range' '
        cat >expect <<-EOF &&
        commit $(git rev-parse main3)
        commit $(git rev-parse main2)
@@ -108,4 +108,16 @@ test_expect_failure '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