test_expect_success \
'Port those patches to orig tree' \
- "(cd foo &&
- GIT_DIR=../bar/.git git-format-patch --stdout bases/master..HEAD |
+ '(cd foo &&
+ GIT_DIR=../bar/.git git-format-patch --stdout \
+ $(cd ../bar && stg id base@master)..HEAD |
git-am -3 -k
)
+ '
+
+test_expect_success \
+ 'Pull those patches applied upstream, without pushing' \
+ "(cd bar && stg pull --nopush
+ )
+"
+
+test_expect_success \
+ 'Try to push those patches without merge detection' \
+ "(cd bar && stg push --all
+ )
"
test_expect_success \
'Pull those patches applied upstream' \
- "(cd bar && stg pull
+ "(cd bar && stg push --undo && stg push --all --merged
)
"
test_expect_success \
'Check that all went well' \
- "diff -u foo/file bar/file
+ "test_cmp foo/file bar/file
"
test_done