X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3501-revert-cherry-pick.sh;h=6da212825a447866364979c2fb10778b6bbc02d5;hb=d5d745f90b929310f3893bb8b3766cc1745140c8;hp=552af1c4d2f7ecc78e3264290e4d82580f464ead;hpb=2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5;p=git.git diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 552af1c4d..6da212825 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -44,7 +44,7 @@ test_expect_success setup ' test_expect_success 'cherry-pick after renaming branch' ' git checkout rename2 && - EDITOR=: VISUAL=: git cherry-pick added && + git cherry-pick added && test -f opos && grep "Add extra line at the end" opos @@ -53,10 +53,19 @@ test_expect_success 'cherry-pick after renaming branch' ' test_expect_success 'revert after renaming branch' ' git checkout rename1 && - EDITOR=: VISUAL=: git revert added && + git revert added && test -f spoo && ! grep "Add extra line at the end" spoo ' +test_expect_success 'revert forbidden on dirty working tree' ' + + echo content >extra_file && + git add extra_file && + test_must_fail git revert HEAD 2>errors && + grep "Dirty index" errors + +' + test_done