On 08/08/17 20:32, Ramsay Jones wrote: > > > On 08/08/17 20:21, René Scharfe wrote: >> 76e368c378 (t3700: fix broken test under !SANITY) explains that the test >> 'git add --chmod=[+-]x changes index with already added file' can fail >> if xfoo3 is still present as a symlink from a previous test and deletes >> it with rm(1). That still leaves it present in the index, which causes >> the test to fail if POSIXPERM is not defined. Get rid of it by calling >> "git reset --hard" as well, as 76e368c378 already mentioned in passing. > > Hmm, I don't think its POSIXPERM (which is defined on cygwin) but > the lack of SANITY that is the problem. The test would fail on Linux > as well, if it skipped the prior tests marked with SANITY (they get > rid of the xfoo3->xfoo2 symlinks, among others). Yep, I didn't read the commit message properly! ;-) > > Ack, this fixes it for me. > > ATB, > Ramsay Jones > >> >> Helped-by: Adam Dinwoodie <adam@xxxxxxxxxxxxx> >> Signed-off-by: Rene Scharfe <l.s.r@xxxxxx> >> --- >> Change since v1: Keep the rm(1) call to avoid a problem on Cygwin. >> >> t/t3700-add.sh | 1 + >> 1 file changed, 1 insertion(+) >> >> 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 && >> >
