t/fmt-merge-msg: do not redirect stderr
All the GPG and GPGSSH tests are redirecing stdout as well as stderr to `actual` and grep for success/failure over the resulting file. However, no output is printed on stderr and we do not need to include it in the grep. Signed-off-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fabian Stelzer committed
Dec 9, 2021 at 09:52 UTC
5a2c1c0deeef3b2980827687b95e4446e1078eb3
1 file changed
+4
-4
t/t6200-fmt-merge-msg.sh
+4
-4
@@ -104,7 +104,7 @@ test_expect_success 'message for merging local branch' '
104
test_expect_success GPG 'message for merging local tag signed by good key' '
105
git checkout main &&
106
git fetch . signed-good-tag &&
107
- git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
107
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
108
grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
109
grep "^# gpg: Signature made" actual &&
110
grep "^# gpg: Good signature from" actual
@@ -113,7 +113,7 @@ test_expect_success GPG 'message for merging local tag signed by good key' '
113
test_expect_success GPG 'message for merging local tag signed by unknown key' '
114
git checkout main &&
115
git fetch . signed-good-tag &&
116
- GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
116
+ GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual &&
117
grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
118
grep "^# gpg: Signature made" actual &&
119
grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual
@@ -123,7 +123,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by good ssh key
123
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
124
git checkout main &&
125
git fetch . signed-good-ssh-tag &&
126
- git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
126
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
127
grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
128
! grep "${GPGSSH_BAD_SIGNATURE}" actual
129
'
@@ -132,7 +132,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh
132
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
133
git checkout main &&
134
git fetch . signed-untrusted-ssh-tag &&
135
- git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
135
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
136
grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
137
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
138
grep "${GPGSSH_KEY_NOT_TRUSTED}" actual