Remove the assert in CommitData.parse() function

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

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index 35c9bdd..e04dac5 100755 (executable)
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh
@@ -23,7 +23,7 @@ test_expect_success \
     stg clone foo bar &&
     (
         cd bar && stg new p1 -m p1 &&
-        printf "a\nc\n" > file && git add file && stg refresh &&
+        printf "a\nc\n" > file && stg add file && stg refresh &&
         stg new p2 -m p2 &&
         printf "a\nb\nc\n" > file && stg refresh &&
         [ "$(echo $(stg series --applied --noprefix))" = "p1 p2" ] &&
@@ -49,14 +49,14 @@ test_expect_success \
 
 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' '
     (
-        cd bar && stg push --undo &&
+        cd bar && stg undo --hard &&
         [ "$(echo $(stg series --applied --noprefix))" = "" ] &&
         [ "$(echo $(stg series --unapplied --noprefix))" = "p1 p2" ]
     )