| commit | fb2afea366044fc2b4fff9929a06a1ca36f506df | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 15 Dec 2017 19:42:36 +0000 (15 11:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Dec 2017 20:58:57 +0000 (19 12:58 -0800) | ||
| tree | 75e18c23c648d35d95ecb5f4561423f3dac53dfe | treesnapshot (tar.gz zip) |
| parent | 7f8ca20a44094dda6e6c74013a36c078cbffc548 | commitdiff |
t5573, t7612: clean up after unexpected success of 'pull' and 'merge'
The previous steps added test_when_finished to tests that run 'git
pull' or 'git merge' 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'
or 'git merge' 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 invocations to succeed or fail.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The previous steps added test_when_finished to tests that run 'git
pull' or 'git merge' 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'
or 'git merge' 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 invocations to succeed or fail.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5573-pull-verify-signatures.sh | diffblobblamehistory | |
| t/t7612-merge-verify-signatures.sh | diffblobblamehistory |