diff options
author | Mehul Jain <mehul.jain2029@gmail.com> | 2016-06-22 22:21:26 +0530 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-06-24 13:01:13 -0700 |
commit | fce04c3ca695d32c1b3c59e1bfc1fb4019025c72 (patch) | |
tree | fd1d6f953456512d916fa177b1856399732a1cc5 /t | |
parent | aa3799996c310da756c7845950def4f6d51cccf3 (diff) | |
download | git-fce04c3ca695d32c1b3c59e1bfc1fb4019025c72.tar.gz |
log: add log.showSignature configuration variablemj/log-show-signature-conf
Users may want to always use "--show-signature" while using git-log and
related commands.
When log.showSignature is set to true, git-log and related commands will
behave as if "--show-signature" was given to them.
Note that this config variable is meant to affect git-log, git-show,
git-whatchanged and git-reflog. Other commands like git-format-patch,
git-rev-list are not to be affected by this config variable.
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-x | t/t4202-log.sh | 20 | ||||
-rwxr-xr-x | t/t7510-signed-commit.sh | 7 |
2 files changed, 27 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 449a5275d4..803e1e6b8f 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -898,6 +898,26 @@ test_expect_success GPG '--no-show-signature overrides --show-signature' ' ! grep "^gpg:" actual ' +test_expect_success GPG 'log.showsignature=true behaves like --show-signature' ' + test_config log.showsignature true && + git log -1 signed >actual && + grep "gpg: Signature made" actual && + grep "gpg: Good signature" actual +' + +test_expect_success GPG '--no-show-signature overrides log.showsignature=true' ' + test_config log.showsignature true && + git log -1 --no-show-signature signed >actual && + ! grep "^gpg:" actual +' + +test_expect_success GPG '--show-signature overrides log.showsignature=false' ' + test_config log.showsignature false && + git log -1 --show-signature signed >actual && + grep "gpg: Signature made" actual && + grep "gpg: Good signature" actual +' + test_expect_success 'log --graph --no-walk is forbidden' ' test_must_fail git log --graph --no-walk ' 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 |