X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/625e8de7db58c85f137e78aaef258afcb1a3151c..de8efe1efc4a495eca0614aa9f6c1910d5838f99:/t/t1202-push-undo.sh diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh index 79439de..5afcf68 100755 --- a/t/t1202-push-undo.sh +++ b/t/t1202-push-undo.sh @@ -21,7 +21,7 @@ test_expect_success \ ' stg new foo -m foo && echo foo > test && - git add test && + stg add test && stg refresh ' @@ -30,7 +30,7 @@ test_expect_success \ ' stg new bar -m bar && echo bar > test && - git add test && + stg add test && stg refresh ' @@ -43,7 +43,7 @@ test_expect_success \ test_expect_success \ 'Push the second patch with conflict' \ ' - conflict_old stg push bar + conflict stg push bar ' test_expect_success \ @@ -55,14 +55,14 @@ test_expect_success \ test_expect_success \ 'Check the push after undo fails as well' \ ' - conflict_old stg push bar + conflict stg push bar ' test_expect_success \ 'Undo with disappeared newborn' \ ' touch newfile && - git add newfile && + stg add newfile && rm newfile && stg undo --hard '