diff options
| -rw-r--r-- | revision.c | 2 | ||||
| -rwxr-xr-x | t/t4202-log.sh | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/revision.c b/revision.c index d30d1c4f80..3546ff9c1b 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 b3d618c43d..449a5275d4 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -893,6 +893,11 @@ 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' ' + git log -1 --show-signature --no-show-signature signed >actual && + ! grep "^gpg:" actual +' + test_expect_success 'log --graph --no-walk is forbidden' ' test_must_fail git log --graph --no-walk ' |