summaryrefslogtreecommitdiff
path: root/t/t7510-signed-commit.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-11 10:31:08 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-11 10:31:08 -0700
commit369dc4081c836bc17ee1debaf6688eb098359760 (patch)
tree89e24346a55c464332e169c8e8306669cc03b323 /t/t7510-signed-commit.sh
parent62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce (diff)
parentfce04c3ca695d32c1b3c59e1bfc1fb4019025c72 (diff)
Merge branch 'mj/log-show-signature-conf'
"git log" learns log.showSignature configuration variable, and a command line option "--no-show-signature" to countermand it. * mj/log-show-signature-conf: log: add log.showSignature configuration variable log: add "--no-show-signature" command line option t4202: refactor test
Diffstat (limited to 't/t7510-signed-commit.sh')
-rwxr-xr-xt/t7510-signed-commit.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 4177a8609a..6e839f5489 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -210,4 +210,11 @@ test_expect_success GPG 'show lack of signature with custom format' '
test_cmp expect actual
'
+test_expect_success GPG 'log.showsignature behaves like --show-signature' '
+ test_config log.showsignature true &&
+ git show initial >actual &&
+ grep "gpg: Signature made" actual &&
+ grep "gpg: Good signature" actual
+'
+
test_done