X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a138c01c81755bd2ac35f3d9726f73596292ab87..809f4f1c1b59a01820f8d259306857cb42ef8ca8:/t/t1205-push-subdir.sh diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh index 54a5b89..175d36d 100755 --- a/t/t1205-push-subdir.sh +++ b/t/t1205-push-subdir.sh @@ -9,7 +9,7 @@ test_expect_success 'Create some patches' ' stg new p$i -m p$i && echo x$i >> x.txt && echo y$i >> foo/y.txt && - stg add x.txt foo/y.txt && + git add x.txt foo/y.txt && stg refresh done && [ "$(echo $(stg applied))" = "p0 p1 p2" ] && @@ -33,7 +33,7 @@ test_expect_success 'Modifying push from a subdir' ' [ "$(echo $(cat foo/y.txt))" = "y0 y1" ] && stg new extra -m extra && echo extra >> extra.txt && - stg add extra.txt && + git add extra.txt && stg refresh && cd foo && stg push && @@ -57,7 +57,7 @@ test_expect_success 'Conflicting add/unknown file in subdir' ' stg new foo -m foo && mkdir d && echo foo > d/test && - stg add d/test && + git add d/test && stg refresh && stg pop && mkdir -p d &&