X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/ef954fe616e3a8012d247292dc8a82a4e3d8d333..5fd79c5f5aa2ea962162260e88f274983cb1e032:/t/t3300-edit.sh diff --git a/t/t3300-edit.sh b/t/t3300-edit.sh index 5c2d32e..7003a27 100755 --- a/t/t3300-edit.sh +++ b/t/t3300-edit.sh @@ -5,7 +5,7 @@ test_description='Test "stg edit"' test_expect_success 'Setup' ' printf "000\n111\n222\n333\n" >> foo && - git add foo && + stg add foo && git commit -m "Initial commit" && sed -i "s/000/000xx/" foo && git commit -a -m "First change" && @@ -99,7 +99,7 @@ EOF } mkeditor vi -test_expect_failure 'Edit commit message interactively (vi)' ' +test_expect_success 'Edit commit message interactively (vi)' ' m=$(msg HEAD) && PATH=.:$PATH stg edit p2 && test "$(msg HEAD)" = "$m/vi" @@ -114,14 +114,14 @@ test_expect_success 'Edit commit message interactively (EDITOR)' ' ' mkeditor e2 -test_expect_failure 'Edit commit message interactively (VISUAL)' ' +test_expect_success 'Edit commit message interactively (VISUAL)' ' m=$(msg HEAD) && VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 && test "$(msg HEAD)" = "$m/e2" ' mkeditor e3 -test_expect_failure 'Edit commit message interactively (core.editor)' ' +test_expect_success 'Edit commit message interactively (core.editor)' ' m=$(msg HEAD) && git config core.editor e3 && VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 && @@ -137,7 +137,7 @@ test_expect_success 'Edit commit message interactively (stgit.editor)' ' ' mkeditor e5 -test_expect_failure 'Edit commit message interactively (GIT_EDITOR)' ' +test_expect_success 'Edit commit message interactively (GIT_EDITOR)' ' m=$(msg HEAD) && GIT_EDITOR=./e5 VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 && test "$(msg HEAD)" = "$m/e5"