X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/78384a2ccda3bd6763d179b3381ff5fcd90c6a5f..a2f4fe7de51cb580ca587d155f01ad569edd36ae:/t/t2300-refresh-subdir.sh diff --git a/t/t2300-refresh-subdir.sh b/t/t2300-refresh-subdir.sh index d1c7168..92c1cc8 100755 --- a/t/t2300-refresh-subdir.sh +++ b/t/t2300-refresh-subdir.sh @@ -8,14 +8,14 @@ test_expect_success 'Refresh from a subdirectory' ' echo foo >> foo.txt && mkdir bar && echo bar >> bar/bar.txt && - stg add foo.txt bar/bar.txt && + git add foo.txt bar/bar.txt && cd bar && stg refresh && cd .. && [ "$(stg status)" = "" ] ' -test_expect_failure 'Refresh again' ' +test_expect_success 'Refresh again' ' echo foo2 >> foo.txt && echo bar2 >> bar/bar.txt && cd bar && @@ -24,4 +24,25 @@ test_expect_failure 'Refresh again' ' [ "$(stg status)" = "" ] ' +test_expect_success 'Refresh file in subdirectory' ' + echo foo3 >> foo.txt && + echo bar3 >> bar/bar.txt && + cd bar && + stg refresh bar.txt && + cd .. && + [ "$(stg status)" = "M foo.txt" ] +' + +test_expect_success 'Refresh whole subdirectory' ' + echo bar4 >> bar/bar.txt && + stg refresh bar && + [ "$(stg status)" = "M foo.txt" ] +' + +test_expect_success 'Refresh subdirectories recursively' ' + echo bar5 >> bar/bar.txt && + stg refresh . && + [ "$(stg status)" = "" ] +' + test_done