summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMehul Jain <mehul.jain2029@gmail.com>2016-06-24 19:42:34 +0530
committerJunio C Hamano <gitster@pobox.com>2016-06-24 13:00:39 -0700
commitaefc81ad38b3a6fc88a0e8db6fafe75692f0d4b3 (patch)
tree05f246870823e3d5bf8dfbda56dc0ed096f094fa
parent49fa3dc76179e04b0833542fa52d0f287a4955ac (diff)
downloadgit-aefc81ad38b3a6fc88a0e8db6fafe75692f0d4b3.tar.gz
t4202: refactor test
Subsequent patches will want to reuse the 'signed' branch that the 'log --graph --show-signature' test creates and uses. Split the set-up part into a test of its own, and make the existing test into a separate one that only inspects the history on the 'signed' branch. This way, it becomes clearer that tests added by subsequent patches reuse the 'signed' branch in the same way. Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4202-log.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 128ba93537..b3d618c43d 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -860,12 +860,15 @@ test_expect_success 'dotdot is a parent directory' '
test_cmp expect actual
'
-test_expect_success GPG 'log --graph --show-signature' '
+test_expect_success GPG 'setup signed branch' '
test_when_finished "git reset --hard && git checkout master" &&
git checkout -b signed master &&
echo foo >foo &&
git add foo &&
- git commit -S -m signed_commit &&
+ git commit -S -m signed_commit
+'
+
+test_expect_success GPG 'log --graph --show-signature' '
git log --graph --show-signature -n1 signed >actual &&
grep "^| gpg: Signature made" actual &&
grep "^| gpg: Good signature" actual