From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Sep 2017 08:02:58 +0000 (+0900)
Subject: Merge branch 'rs/t3700-clean-leftover' into maint
X-Git-Tag: v2.14.2~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f35a1d75b5ecefaef7b1a8ec55543c82883df82f?hp=8f3d48e14e7f15dd59592754416764db3060873d

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

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 f3a4b4a913..0aae21d698 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -356,6 +356,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 &&