Merge branch 'maint'

diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 552af1c4d2f7ecc78e3264290e4d82580f464ead..bb4cf00d78637b3bdf0c4e3da99291e0ab3c718f 100755 (executable)
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -44,7 +44,8 @@ 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 $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
        test -f opos &&
        grep "Add extra line at the end" opos
 
@@ -53,10 +54,20 @@ 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 $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
        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