On Fri, Dec 15, 2017 at 11:48:29AM -0800, Junio C Hamano wrote: > Here is what I would propose as a follow-up polishing. > > -- >8 -- > Subject: [PATCH 3/2] t5573: clean up after unexpected success of 'pull', too > > The previous step added test_when_finished to tests that run 'git > pull' with expectation of success, so that the test after them can > start from a known state even when their 'git pull' invocation > unexpectedly fails. However, tests that run 'git pull' expecting > it not to succeed forgot to protect later tests the same way---if > they unexpectedly succeed, the test after them would start from an > unexpected state. > > Reset and checkout the initial commit after all these tests, whether > they expect their 'git pull' invocations to succeed or fail. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > t/t5573-pull-verify-signatures.sh | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) Thanks! t7612-merge-verify-signatures.sh also lacks cleanup for test_must_fail brokenness. Would you prefer test_when_finished to be included in the two patches as a v3? -- hji
