X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/53f76663a55fc98d43d283dbef2306aac880d771..34a1b4c2988875ba064cd3a261f3d3b8c63d7f8e:/t/t1200-push-modified.sh diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh index 7847a38..6769667 100755 --- a/t/t1200-push-modified.sh +++ b/t/t1200-push-modified.sh @@ -30,11 +30,12 @@ test_expect_success \ 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 to sync with parent, preparing for the problem' \