[PATCH 2/2] log: "--no-show-signature" commmand-line option
- From
Mehul Jain <mehul.jain2029@gmail.com>
- Date
- Jun 5, 2016, 15:39 UTC
- Message-ID
- <20160605153933.15231-3-mehul.jain2029@gmail.com>
- 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