Merge branch 'cr/tag-options'

diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 552af1c4d2f7ecc78e3264290e4d82580f464ead..2dbe04fb20aea9a18e6fe751539bcb48e5e7b4d3 100755 (executable)
--- 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,7 +53,7 @@ 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