X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/92d99c04b37e536ef01dad4f9936a67f1da710fa..16d69115caef1a194384f0f0f668e6789b838909:/t/t1201-pull-trailing.sh diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh index 42c6619..46d9f82 100755 --- a/t/t1201-pull-trailing.sh +++ b/t/t1201-pull-trailing.sh @@ -28,11 +28,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 those patches applied upstream, without pushing' \