X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/f9d9a06200ab37e52ac737ce9e3c050100e5aa15..refs/heads/origin:/t/t1302-repair-interop.sh diff --git a/t/t1302-repair-interop.sh b/t/t1302-repair-interop.sh index 224c4ba..cce3cf1 100755 --- a/t/t1302-repair-interop.sh +++ b/t/t1302-repair-interop.sh @@ -4,7 +4,7 @@ test_description='Test git/StGit interoperability with "stg repair"' test_expect_success 'Create some git-only history' ' echo foo > foo.txt && - git add foo.txt && + stg add foo.txt && git commit -a -m foo && git tag foo-tag && for i in 0 1 2 3 4; do @@ -25,7 +25,7 @@ test_expect_success 'Create five patches' ' [ "$(echo $(stg series --unapplied --noprefix))" = "" ] ' -test_expect_success 'Pop two patches with git-reset' ' +test_expect_success 'Pop two patches with git reset' ' git reset --hard HEAD~2 && command_error stg refresh && stg repair && @@ -40,7 +40,7 @@ test_expect_success 'Create a new patch' ' [ "$(echo $(stg series --unapplied --noprefix))" = "p3 p4" ] ' -test_expect_success 'Go to an unapplied patch with with git-reset' ' +test_expect_success 'Go to an unapplied patch with with git reset' ' git reset --hard $(stg id p3) && command_error stg refresh && stg repair && @@ -49,7 +49,7 @@ test_expect_success 'Go to an unapplied patch with with git-reset' ' [ "$(echo $(stg series --unapplied --noprefix))" = "q0 p4" ] ' -test_expect_success 'Go back to below the stack base with git-reset' ' +test_expect_success 'Go back to below the stack base with git reset' ' git reset --hard foo-tag && stg repair && [ "$(echo $(stg series --applied --noprefix))" = "" ] &&