Merge branch 'maint-2.9' into maint-2.10

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 924a26612681817156e54f4c1bc4a89e7cb5e8de..53c0cb6dea686ac872c219b746a0c24b3d505416 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -350,6 +350,7 @@ test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
 '
 
 test_expect_success 'git add --chmod=[+-]x changes index with already added file' '
+       rm -f foo3 xfoo3 &&
        echo foo >foo3 &&
        git add foo3 &&
        git add --chmod=+x foo3 &&