From: Mehul Jain <mehul.jain2029@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>,
Mehul Jain <mehul.jain2029@gmail.com>
Subject: [PATCH 2/2] log: "--no-show-signature" commmand-line option
Date: Sun, 5 Jun 2016 21:09:33 +0530 [thread overview]
Message-ID: <20160605153933.15231-3-mehul.jain2029@gmail.com> (raw)
In-Reply-To: <20160605153933.15231-1-mehul.jain2029@gmail.com>
If "log.showSignature=true", then there is no way to override it using
command line switch.
Teach git-log and related commands about "--no-showSignature" command
line option.
Note that introduction of "--no-show-signature" is meant to tackle
the above mentioned problem for the following commands: git-log,
git-show, git-whatchanged and git-reflog. It does not suggest that
we need "log.showSignature" config variable to affect other git
commands, as currently "log.showSignature" is only meant to affect
git-log, git-show, git-whatchanged and git-reflog.
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
---
revision.c | 2 ++
t/t4202-log.sh | 6 ++++++
2 files changed, 8 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 3e4a4ac..026808e 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -901,6 +901,12 @@ test_expect_success GPG 'log.showsignature=true behaves like --show-signature' '
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_when_finished "git reset --hard && git checkout master" &&
test_config log.showsignature false &&
--
2.9.0.rc0.dirty
next prev parent reply other threads:[~2016-06-05 15:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-05 15:39 [PATCH 0/2] Introduce "log.showSignature" config variable Mehul Jain
2016-06-05 15:39 ` [PATCH 1/2] log: add "log.showsignature" configuration variable Mehul Jain
2016-06-05 15:39 ` Mehul Jain [this message]
2016-06-06 18:50 ` [PATCH 2/2] log: "--no-show-signature" commmand-line option Junio C Hamano
2016-06-08 6:04 ` Mehul Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160605153933.15231-3-mehul.jain2029@gmail.com \
--to=mehul.jain2029@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).