If "log.showsignature=true", then there is no way to override it using
command line switch.
Teach "git log" and "git show" about "--no-show-signature" command line
option.
Signed-off-by: Mehul Jain <mehul.jain2...@gmail.com>
---
revision.c | 2 ++
t/t4202-log.sh | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/revision.c b/revision.c
index d30d1c4..3546ff9 100644
--- a/revision.c
+++ b/revision.c
@@ -1871,6 +1871,8 @@ static int handle_revision_opt(struct rev_info *revs, int
argc, const char **arg
revs->notes_opt.use_default_notes = 1;
} else if (!strcmp(arg, "--show-signature")) {
revs->show_signature = 1;
+ } else if (!strcmp(arg, "--no-show-signature")) {
+ revs->show_signature = 0;
} else if (!strcmp(arg, "--show-linear-break") ||
starts_with(arg, "--show-linear-break=")) {
if (starts_with(arg, "--show-linear-break="))
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 36be9a1..ea24259 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -901,6 +901,13 @@ test_expect_success GPG 'log.showsignature=true behaves
like --show-signature' '
test_i18ngrep "gpg: Good signature" actual
'
+test_expect_success GPG '--no-show-signature overrides log.showsignature=true'
'
+ git config log.showsignature true &&
+ git log -1 --no-show-signature signed >actual &&
+ test "$(test_i18ngrep "gpg: Signature made" actual)" = "" &&
+ test "$(test_i18ngrep "gpg: Good signature" actual)" = ""
+'
+
test_expect_success GPG '--show-signature overrides log.showsignature=false' '
test_when_finished "git reset --hard && git checkout master" &&
git config log.showsignature false &&
--
2.9.0.rc0.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
