'
stg new foo -m foo &&
echo foo > test &&
- git add test &&
+ stg add test &&
stg refresh
'
'
stg new bar -m bar &&
echo bar > test &&
- git add test &&
+ stg add test &&
stg refresh
'
test_expect_success \
'Push the second patch with conflict' \
'
- conflict_old stg push bar
+ conflict stg push bar
'
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
'