X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/baf8241d1b7835ba31125d2b75683601ee2b0403..c7506039d0299c093140857b7a617ec6bcdbfc13:/t/t2300-refresh-subdir.sh diff --git a/t/t2300-refresh-subdir.sh b/t/t2300-refresh-subdir.sh index d731a11..34d6e69 100755 --- a/t/t2300-refresh-subdir.sh +++ b/t/t2300-refresh-subdir.sh @@ -8,7 +8,7 @@ test_expect_success 'Refresh from a subdirectory' ' echo foo >> foo.txt && mkdir bar && echo bar >> bar/bar.txt && - git add foo.txt bar/bar.txt && + stg add foo.txt bar/bar.txt && cd bar && stg refresh && cd .. && @@ -48,7 +48,7 @@ test_expect_success 'Refresh subdirectories recursively' ' test_expect_success 'refresh -u' ' echo baz >> bar/baz.txt && stg new p1 -m p1 && - git add bar/baz.txt && + stg add bar/baz.txt && stg refresh --index && echo xyzzy >> foo.txt && echo xyzzy >> bar/bar.txt && @@ -65,7 +65,7 @@ test_expect_success 'refresh -u -p ' ' test_expect_success 'refresh an unapplied patch' ' stg refresh -u && - stg goto p0 && + stg goto --keep p0 && test "$(stg status)" = "M foo.txt" && stg refresh -p p1 && test "$(stg status)" = "" &&