'
stg new foo -m foo &&
echo foo > test &&
- stg add test &&
+ git add test &&
stg refresh
'
'
stg new bar -m bar &&
echo bar > test &&
- stg add test &&
+ git add test &&
stg refresh
'
stg pop --all
'
-test_expect_failure \
+test_expect_success \
'Push the second patch with conflict' \
'
- stg push bar
+ conflict_old stg push bar
'
test_expect_success \
'Undo the previous push' \
'
- stg status --reset &&
+ stg push --undo
+ '
+
+test_expect_success \
+ 'Check the push after undo fails as well' \
+ '
+ conflict_old stg push bar
+ '
+
+test_expect_success \
+ 'Undo with disappeared newborn' \
+ '
+ touch newfile &&
+ git add newfile &&
+ rm newfile &&
stg push --undo
'