Skip to content

Commit cafd345

Browse files
FStelzergitster
authored andcommitted
t/fmt-merge-msg: make gpgssh tests more specific
Some GPGSSH fmt-merge-msg tests were only grepping for failed/successful signature validation and not checking for the tag in the resulting merge message. Add the missing grep for it. Signed-off-by: Fabian Stelzer <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5a2c1c0 commit cafd345

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

t/t6200-fmt-merge-msg.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by good ssh key
124124
git checkout main &&
125125
git fetch . signed-good-ssh-tag &&
126126
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
127+
grep "^Merge tag ${apos}signed-good-ssh-tag${apos}" actual &&
127128
grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
128129
! grep "${GPGSSH_BAD_SIGNATURE}" actual
129130
'
@@ -133,6 +134,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh
133134
git checkout main &&
134135
git fetch . signed-untrusted-ssh-tag &&
135136
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
137+
grep "^Merge tag ${apos}signed-untrusted-ssh-tag${apos}" actual &&
136138
grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
137139
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
138140
grep "${GPGSSH_KEY_NOT_TRUSTED}" actual

0 commit comments

Comments
 (0)