Merge branch 'tg/add-chmod+x-fix' into maint

gitster · gitster · commit dce97d6ec73c · 2016-10-28T09:01:19.000-07:00
A hot-fix for a test added by a recent topic that went to both
'master' and 'maint' already.

* tg/add-chmod+x-fix:
  t3700: fix broken test under !SANITY
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,7 @@ test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '`
`350`	`350`	`'`
`351`	`351`
`352`	`352`	`test_expect_success 'git add --chmod=[+-]x changes index with already added file' '`
	`353`	`+ rm -f foo3 xfoo3 &&`
`353`	`354`	`echo foo >foo3 &&`
`354`	`355`	`git add foo3 &&`
`355`	`356`	`git add --chmod=+x foo3 &&`