'Port those patches to orig tree' '
(
cd foo &&
- GIT_DIR=../bar/.git git-format-patch --stdout \
- $(cd ../bar && stg id master:{base})..HEAD | git-am -3 -k
+ GIT_DIR=../bar/.git git format-patch --stdout \
+ $(cd ../bar && stg id master:{base})..HEAD | git am -3 -k
)
'
test_expect_success \
'Attempt to push the first of those patches without --merged' \
- "(cd bar && conflict_old stg push
+ "(cd bar && conflict stg push
)
"
test_expect_success \
'Rollback the push' '
(
- cd bar && stg push --undo &&
+ cd bar && stg undo --hard &&
[ "$(echo $(stg series --applied --noprefix))" = "" ] &&
[ "$(echo $(stg series --unapplied --noprefix))" = "p1 p2" ]
)