X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/2ac49695d699a49f70bc2a899889d723797c6e12..972d5077631c3bb6641ffefc6f59a6b4d2fbdfdd:/t/t1201-pull-trailing.sh

diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh
index e5fac88..a993aeb 100755
--- a/t/t1201-pull-trailing.sh
+++ b/t/t1201-pull-trailing.sh
@@ -18,7 +18,7 @@ test_create_repo foo
 test_expect_success \
     'Setup and clone tree, and setup changes' \
     "(cd foo &&
-      printf 'a\nb\n' > file && git add file && git commit -m .
+      printf 'a\nb\n' > file && stg add file && git commit -m .
      ) &&
      stg clone foo bar &&
      (cd bar && stg new p1 -m p1
@@ -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 |
-      git-am -3 -k
+    '(cd foo &&
+      GIT_DIR=../bar/.git git format-patch --stdout \
+          $(cd ../bar && stg id master:{base})..HEAD |
+      git am -3 -k
      )
-"
+    '
 
 test_expect_success \
     'Pull those patches applied upstream, without pushing' \
@@ -40,7 +41,7 @@ test_expect_success \
      )
 "
 
-test_expect_failure \
+test_expect_success \
     'Try to push those patches without merge detection' \
     "(cd bar && stg push --all
      )
@@ -48,13 +49,13 @@ test_expect_failure \
 
 test_expect_success \
     'Pull those patches applied upstream' \
-    "(cd bar && stg push --all --merged
+    "(cd bar && stg 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