Merge commit 'kha/safe'

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

diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh
index 9d70fe02fcd499ae0c52602bb21a5af0ec18e47c..d66ad26df7f66a87a8da1627c9f1de6ce7edddf5 100755 (executable)
--- a/t/t1201-pull-trailing.sh
+++ b/t/t1201-pull-trailing.sh
@@ -29,9 +29,9 @@ test_expect_success \
 test_expect_success \
     'Port those patches to orig tree' \
     '(cd foo &&
 test_expect_success \
     'Port those patches to orig tree' \
     '(cd foo &&

-      GIT_DIR=../bar/.git git-format-patch --stdout \
-          $(cd ../bar && stg id base@master)..HEAD |
-      git-am -3 -k
+      GIT_DIR=../bar/.git git format-patch --stdout \
+          $(cd ../bar && stg id master:{base})..HEAD |
+      git am -3 -k

      )
     '
 
      )
     '
 


@@ -49,7 +49,7 @@ test_expect_success \
 
 test_expect_success \
     'Pull those patches applied upstream' \
 
 test_expect_success \
     'Pull those patches applied upstream' \

-    "(cd bar && stg push --undo && stg push --all --merged
+    "(cd bar && stg undo && stg push --all --merged

      )
 "
 
      )
 "