X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/cb68860194290ad4eb6a2baa65a53a756ad98b7b..cb1570e14f5e021ccd6580f207fdc6297611fc49:/t/t1202-push-undo.sh diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh index 51ae138..544fe8d 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 ' @@ -43,7 +43,7 @@ test_expect_success \ test_expect_success \ 'Push the second patch with conflict' \ ' - ! stg push bar + conflict_old stg push bar ' test_expect_success \ @@ -55,7 +55,16 @@ test_expect_success \ test_expect_success \ 'Check the push after undo fails as well' \ ' - ! stg push bar + conflict_old stg push bar + ' + +test_expect_success \ + 'Undo with disappeared newborn' \ + ' + touch newfile && + git add newfile && + rm newfile && + stg push --undo ' test_done