[PATCH v2 1/2] log: add "--no-show-signature" command line option

From

Mehul Jain <mehul.jain2029@gmail.com>

Date

Jun 18, 2016, 12:25 UTC

Message-ID

<20160618122510.5105-2-mehul.jain2029@gmail.com>

In-Reply-To

<20160618122510.5105-1-mehul.jain2029@gmail.com>

If an user creates an alias with "--show-signature" in command line,
e.g.
	[alias] logss = log --show-signature

then there is no way to countermand it through command line.

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
---
 revision.c     |  2 ++
 t/t4202-log.sh | 10 ++++++++++
 2 files changed, 12 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 128ba93..02384a3 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -890,6 +890,16 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
 	grep "^| | gpg: Good signature" actual
 '
 
+test_expect_success GPG '--no-show-signature overrides --show-signature' '
+	test_when_finished "git reset --hard && git checkout master" &&
+	git checkout -b nosign master &&
+	echo foo >foo &&
+	git add foo &&
+	git commit -S -m signed_commit &&
+	git log -1 --show-signature --no-show-signature nosign >actual &&
+	! grep "^gpg:" actual
+'
+
 test_expect_success 'log --graph --no-walk is forbidden' '
 	test_must_fail git log --graph --no-walk
 '

-- 
2.9.0.rc0.dirty