Re: [PATCH] Fix t6031 on filesystems without working exec bit

Alex Riesen, Thu, May 22, 2008 15:12:58 +0200:

Junio C Hamano, Thu, May 22, 2008 11:04:09 +0200:

quoted

If your repository is marked so that executable bit is untrustworthy
there, the check done when switching to branch "a1" to compare if "file1"
that is involved in the switch operation has local changes should ignore
(apparent and false) executable-bit change, shouldn't it?

Will see next monday, when I get back to that wretched laptop.

I managed to get my hands on it today and tried the test with your
modification. The test succeeds always and it succeeds with or without
the chmod. So it seems merge-recursive somehow ignores the x-bit from
working tree, I just cannot not find how and where.