From: Felipe Contreras Date: Thu, 26 Nov 2020 00:16:14 GMT Subject: [PATCH v4 1/3] tests: push: improve cleanup of HEAD tests Message-ID: <20201126001616.663910-2-felipe.contreras@gmail.com> In-Reply-To: <20201126001616.663910-1-felipe.contreras@gmail.com> So that we are not left in an inconsistent state between them. Signed-off-by: Felipe Contreras --- t/t5516-fetch-push.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index d11382f769..4077471937 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -449,6 +449,7 @@ test_expect_success 'push with HEAD nonexisting at remote' ' mk_test testrepo heads/master && git checkout -b local master && + test_when_finished "git checkout master; git branch -D local" && git push testrepo HEAD && check_push_result testrepo $the_commit heads/local ' @@ -457,8 +458,8 @@ test_expect_success 'push with +HEAD' ' mk_test testrepo heads/master && git checkout master && - git branch -D local && git checkout -b local && + test_when_finished "git checkout master; git branch -D local" && git push testrepo master local && check_push_result testrepo $the_commit heads/master && check_push_result testrepo $the_commit heads/local && @@ -488,6 +489,7 @@ test_expect_success 'push with config remote.*.push = HEAD' ' mk_test testrepo heads/local && git checkout master && git branch -f local $the_commit && + test_when_finished "git branch -D local" && ( cd testrepo && git checkout local && -- 2.29.2