On 08.12.2021 15:20, Junio C Hamano wrote:
Fabian Stelzer <fs@xxxxxxxxxxxx> writes:
All the GPG, GPGSSH and the new GPGSSH_VERIFYTIME tests are redirecing
stdout as well as stderr to `actual` and grep for success/failure over
the resulting flie. However, no output is printed on stderr and we do
not need to include it in the grep. The newer SSH signing based tests
are also missing a grep for the merged tag to make sure the merge
message is correct.
- remove unneccessary 2>&1 redirects
- add grep for merged tag to gpgssh* tests
Signed-off-by: Fabian Stelzer <fs@xxxxxxxxxxxx>
---
t/t6200-fmt-merge-msg.sh | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
The 4 hunks at the beginning seems to be a clean-up of the existing
issue, but aren't hunks -162,7, -170,7, -178,7, 187,7 "oops, we
screwed up in [6/8], and we patch up after the fact"?
For a new topic not yet in 'next', we'd prefer to pretend to be more
perfect humans by not deliberatly keeping mistakes made in an
earlier step, only to be corrected in a later step.
While there may not be any difference in the end-result, it would be
cleaner and less sloppy to have the 4 hunks to fix the ones before
the series as a preliminary clean-up step, and the other hunks
folded into the step that introduced the problem, no?
Ok, i will send a new version with the fixes for the earlier tests in extra
commits. Your 5.1 includes a +"grep "^Merge tag
${apos}signed-untrusted-ssh-tag${apos}" actual &&" fix for a preexisting
test in the first patch which now claims to only remove the stderr redirects
though. Also another grep for the merged tag for an earlier test got lost
somewhere. I'll send a 5.2
Thanks
