Merge commit 'kha/safe'

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

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index 35c9bdda24b09eeadfdcfce199eac97870f6a540..2077492fbb9f9ec6821fc60ace0fbe340a2057de 100755 (executable)
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh
@@ -49,14 +49,14 @@ test_expect_success \
 
 test_expect_success \
     'Attempt to push the first of those patches without --merged' \
 
 test_expect_success \
     'Attempt to push the first of those patches without --merged' \

-    "(cd bar && conflict_old stg push
+    "(cd bar && conflict stg push

      )
 "
 
 test_expect_success \
     'Rollback the push' '
     (
      )
 "
 
 test_expect_success \
     'Rollback the push' '
     (

-        cd bar && stg push --undo &&
+        cd bar && stg undo --hard &&

         [ "$(echo $(stg series --applied --noprefix))" = "" ] &&
         [ "$(echo $(stg series --unapplied --noprefix))" = "p1 p2" ]
     )
         [ "$(echo $(stg series --applied --noprefix))" = "" ] &&
         [ "$(echo $(stg series --unapplied --noprefix))" = "p1 p2" ]
     )