mirror of
https://github.com/git/git.git
synced 2024-05-29 14:26:11 +02:00
tests: push: improve cleanup of HEAD tests
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:
parent
b291b0a628
commit
12a30a3ea6
|
@ -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 &&
|
||||
|
|
Loading…
Reference in New Issue