Test stg refresh more extensively -- including some things it only recently learned to do. Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx> --- t/t2300-refresh-subdir.sh | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/t/t2300-refresh-subdir.sh b/t/t2300-refresh-subdir.sh index 92c1cc8..d731a11 100755 --- a/t/t2300-refresh-subdir.sh +++ b/t/t2300-refresh-subdir.sh @@ -4,7 +4,7 @@ test_description='Test the refresh command from a subdirectory' stg init test_expect_success 'Refresh from a subdirectory' ' - stg new foo -m foo && + stg new p0 -m p0 && echo foo >> foo.txt && mkdir bar && echo bar >> bar/bar.txt && @@ -45,4 +45,31 @@ test_expect_success 'Refresh subdirectories recursively' ' [ "$(stg status)" = "" ] ' +test_expect_success 'refresh -u' ' + echo baz >> bar/baz.txt && + stg new p1 -m p1 && + git add bar/baz.txt && + stg refresh --index && + echo xyzzy >> foo.txt && + echo xyzzy >> bar/bar.txt && + echo xyzzy >> bar/baz.txt && + stg refresh -u && + test "$(echo $(stg status))" = "M bar/bar.txt M foo.txt" +' + +test_expect_success 'refresh -u -p <subdir>' ' + echo xyzzy >> bar/baz.txt && + stg refresh -p p0 -u bar && + test "$(echo $(stg status))" = "M bar/baz.txt M foo.txt" +' + +test_expect_success 'refresh an unapplied patch' ' + stg refresh -u && + stg goto p0 && + test "$(stg status)" = "M foo.txt" && + stg refresh -p p1 && + test "$(stg status)" = "" && + test "$(echo $(stg files p1))" = "A bar/baz.txt M foo.txt" +' + test_done -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html