mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: push: improve cleanup of HEAD tests

Browse Source 
So that we are not left in an inconsistent state between them.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2020-11-25 18:16:14 -06:00 committed by Junio C Hamano
parent b291b0a628
commit 12a30a3ea6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t5516-fetch-push.sh
View File

@ -449,6 +449,7 @@ test_expect_success 'push with HEAD nonexisting at remote' '
mk_test testrepo heads/master && mk_test testrepo heads/master &&
git checkout -b local master && git checkout -b local master &&
test_when_finished "git checkout master; git branch -D local" &&
git push testrepo HEAD && git push testrepo HEAD &&
check_push_result testrepo $the_commit heads/local check_push_result testrepo $the_commit heads/local
' '
@ -457,8 +458,8 @@ test_expect_success 'push with +HEAD' '
mk_test testrepo heads/master && mk_test testrepo heads/master &&
git checkout master && git checkout master &&
git branch -D local &&
git checkout -b local && git checkout -b local &&
test_when_finished "git checkout master; git branch -D local" &&
git push testrepo master local && git push testrepo master local &&
check_push_result testrepo $the_commit heads/master && check_push_result testrepo $the_commit heads/master &&
check_push_result testrepo $the_commit heads/local && 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 && mk_test testrepo heads/local &&
git checkout master && git checkout master &&
git branch -f local $the_commit && git branch -f local $the_commit &&
test_when_finished "git branch -D local" &&
( (
cd testrepo && cd testrepo &&
git checkout local && git checkout local &&