Re: [regression] `make profile-install` fails in 2.10.1
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 19, 2016, 22:27 UTC
- Message-ID
- <xmqqh988j7oo.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20161019210519.ubk5q54rrvbafch7@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 5 quoted lines
> I can't reproduce any problems with raciness there, but there is a known > problem with running the script as root (which I guess you might be > doing from your "make prefix=/usr" call). There's some discussion in > http://public-inbox.org/git/20161010035756.38408-1-jeremyhu@apple.com/T/#u, > but it looks like the patch stalled.
Ouch. Thanks for a reminder. How about doing this for now?
-- >8 -- From: Junio C Hamano <gitster@pobox.com> Date: Mon, 10 Oct 2016 10:41:51 -0700 Subject: [PATCH] t3700: fix broken test under !SANITY
An "add --chmod=+x" test recently added by 610d55af0f ("add: modify already added files when --chmod is given", 2016-09-14) used "xfoo3" as a test file. The paths xfoo[1-3] were used by earlier tests for symbolic links but they were expected to have been removed by the test script reached this new test.
The removal with "git reset --hard" however happened in tests that are protected by POSIXPERM,SANITY prerequisites. Platforms and test environments that lacked these would have seen xfoo3 as a leftover symbolic link, pointing somewhere else, and chmod test would have given a wrong result.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- t/t3700-add.sh | 1 + 1 file changed, 1 insertion(+)
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 924a266126..53c0cb6dea 100755 --- 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 &&
-- 2.10.1-633-g7f0e449216