Merge branch 'rs/t3700-clean-leftover' into next

A test fix.

* rs/t3700-clean-leftover:
t3700: fix broken test under !POSIXPERM

diff --combined t/t3700-add.sh
index 40a0d2b52d34e762125e3e019649b51ac71badca,0aae21d6984bf0bd5c7c7de425a021da6122beee..2748805642201d7c514792bab8d8b3940fb4086c
--- 1/t/t3700-add.sh
--- 2/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@@ -331,8 -331,9 +331,8 @@@ test_expect_success 'git add --dry-run 
        test_i18ncmp expect.err actual.err
  '
  
 -test_expect_success 'git add empty string should invoke warning' '
 -      git add "" 2>output &&
 -      test_i18ngrep "warning: empty strings" output
 +test_expect_success 'git add empty string should fail' '
 +      test_must_fail git add ""
  '
  
  test_expect_success 'git add --chmod=[+-]x stages correctly' '
@@@ -355,6 -356,7 +355,7 @@@ test_expect_success POSIXPERM,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 &&