Merge branch 'cc/subprocess-handshake-missing-capabilities' into next

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 40a0d2b52d34e762125e3e019649b51ac71badca..2748805642201d7c514792bab8d8b3940fb4086c 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -355,6 +355,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 &&
+       git reset --hard &&
        echo foo >foo3 &&
        git add foo3 &&
        git add --chmod=+x foo3 &&