Fix error in status.py when calling git.resolved

[stgit] / t / t1202-push-undo.sh

diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh
index 45dabb49d4a58bf6cd7581650496093bb66d899e..b602643f9018509bc605de1199afe47bd178453e 100755 (executable)
--- 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 new foo -m foo &&
        echo foo > test &&

-       stg add test &&
+       git add test &&

        stg refresh
        '
 
        stg refresh
        '
 


@@ -30,7 +30,7 @@ test_expect_success \
        '
        stg new bar -m bar &&
        echo bar > test &&
        '
        stg new bar -m bar &&
        echo bar > test &&

-       stg add test &&
+       git add test &&

        stg refresh
        '
 
        stg refresh
        '
 


@@ -40,16 +40,30 @@ test_expect_success \
        stg pop --all
        '
 
        stg pop --all
        '
 

-test_expect_failure \
+test_expect_success \

        'Push the second patch with conflict' \
        '
        'Push the second patch with conflict' \
        '

-       stg push bar
+       ! stg push bar

        '
 
 test_expect_success \
        'Undo the previous push' \
        '
        '
 
 test_expect_success \
        'Undo the previous push' \
        '

-       stg status --reset &&
+       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
        '
 
        stg push --undo
        '