Don't use refs/bases/<branchname>

[stgit] / t / t1201-pull-trailing.sh

diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh
index e5fac88..46d9f82 100755 (executable)
--- 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' \
@@ -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,7 +49,7 @@ test_expect_failure \
 
 test_expect_success \
     'Pull those patches applied upstream' \
-    "(cd bar && stg push --all --merged
+    "(cd bar && stg push --undo && stg push --all --merged
      )
 "