Merge branch 'jc/cache-tree' into next

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 9c5a15a15e6be5548f7cc8836286cc5a8b39d4ca..114938c3ff18fadb130e6809fc14e89cfe3f36f2 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -94,7 +94,7 @@ test_expect_success \
 test_expect_success \
     'merge-setup part 4' \
     'echo "evil merge." >>file &&
-     EDITOR=: git commit -a --amend'
+     EDITOR=: VISUAL=: git commit -a --amend'
 
 test_expect_success \
     'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \