X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/53f76663a55fc98d43d283dbef2306aac880d771..67e5c1c662186cd78b193d87cecd1d3097b909da:/t/t1200-push-modified.sh

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index 7847a38..324b3b0 100755
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh
@@ -21,20 +21,21 @@ test_create_repo foo
 test_expect_success \
     'Clone tree and setup changes' \
     "stg clone foo bar &&
-     (cd bar && stg new p1 -m p1
+     (cd bar && stg new p1 -m p1 &&
       printf 'a\nc\n' > file && stg add file && stg refresh &&
-      stg new p2 -m p2
+      stg new p2 -m p2 &&
       printf 'a\nb\nc\n' > file && stg refresh
      )
 "
 
 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' \