Remove an unnecessary parameter to make_patch_name

[stgit] / t / t1200-push-modified.sh

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index 433e4526b92dd7f3bf0c3cc7ff604a076e615ce7..6769667fc6003945da33790b43cffb5802572949 100755 (executable)
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh
@@ -30,11 +30,12 @@ test_expect_success \
 
 test_expect_success \
     'Port those patches to orig tree' \
 
 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
      )
       git-am -3 -k
      )

-"
+    '

 
 test_expect_success \
     'Pull to sync with parent, preparing for the problem' \
 
 test_expect_success \
     'Pull to sync with parent, preparing for the problem' \


@@ -51,7 +52,7 @@ test_expect_failure \
 
 test_expect_success \
     'Rollback the push' \
 
 test_expect_success \
     'Rollback the push' \

-    "(cd bar && stg status --reset && stg push --undo
+    "(cd bar && stg push --undo

      )
 "
 
      )
 "