From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Aug 2017 20:52:53 +0000 (-0700)
Subject: Merge branch 'rs/t3700-clean-leftover' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12232a8cd3eed51542cea5ea7a68af3fa9a88524?hp=b2ad043e6ae0c0879dbfc5db4ecc002204717660

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

A test fix.

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

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 40a0d2b52d..2748805642 100755
--- 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 &&