X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a57bd72016d3cf3ee8e8fd7ae2c12e047999b602..809f4f1c1b59a01820f8d259306857cb42ef8ca8:/t/t1202-push-undo.sh?ds=sidebyside diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh index 335b554..b602643 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 && - stg add test && + git add test && stg refresh ' @@ -30,7 +30,7 @@ test_expect_success \ ' stg new bar -m bar && echo bar > test && - stg add test && + git add test && stg refresh ' @@ -40,10 +40,10 @@ test_expect_success \ stg pop --all ' -test_expect_failure \ +test_expect_success \ 'Push the second patch with conflict' \ ' - stg push bar + ! stg push bar ' test_expect_success \ @@ -52,4 +52,19 @@ test_expect_success \ stg push --undo ' +test_expect_success \ + 'Check the push after undo fails as well' \ + ' + ! stg push bar + ' + +test_expect_success \ + 'Undo with disappeared newborn' \ + ' + touch newfile && + git add newfile && + rm newfile && + stg push --undo + ' + test_done