Skip to content

Commit 90110d7

Browse files
Ramsay Jonesgitster
authored andcommitted
compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
The current t9300-fast-import.sh test number 62 ("L: nested tree copy does not corrupt deltas") was introduced in commit 9a0edb7 ("fast-import: add a test for tree delta base corruption", 15-08-2011). A fix for the demonstrated problem was introduced by commit 8fb3ad7 ("fast-import: prevent producing bad delta", 15-08-2011). However, this fix didn't work on MinGW and so this test has always failed on MinGW. Part of the solution in commit 8fb3ad7 was to add an NO_DELTA preprocessor constant which was defined as follows: +/* + * We abuse the setuid bit on directories to mean "do not delta". + */ +#define NO_DELTA S_ISUID + Unfortunately, the S_ISUID constant on MinGW is defined as zero. In order to fix the problem, we simply alter the definition of S_ISUID in the mingw header file to a more appropriate value. Also, we take the opportunity to similarly define S_ISGID and S_ISVTX. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e8dde3e commit 90110d7

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

compat/mingw.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ typedef int socklen_t;
2222
#define S_IWOTH 0
2323
#define S_IXOTH 0
2424
#define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
25-
#define S_ISUID 0
26-
#define S_ISGID 0
27-
#define S_ISVTX 0
25+
26+
#define S_ISUID 0004000
27+
#define S_ISGID 0002000
28+
#define S_ISVTX 0001000
2829

2930
#define WIFEXITED(x) 1
3031
#define WIFSIGNALED(x) 0

0 commit comments

Comments
 (0)