summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-05 19:42:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-05 19:42:35 (GMT)
commit2528ff079c9dd8a47483d841f53cd93ec1044a72 (patch)
treef32e5bd286091c197f59df58f1124c43c5d3438e /compat
parent9b144d869f29902ec11b6a4e996ab155a49377d8 (diff)
parentba6fad02b6cbbfbf5acf3303b4d8ddfd8624fdb2 (diff)
downloadgit-2528ff079c9dd8a47483d841f53cd93ec1044a72.zip
git-2528ff079c9dd8a47483d841f53cd93ec1044a72.tar.gz
git-2528ff079c9dd8a47483d841f53cd93ec1044a72.tar.bz2
Merge branch 'js/windows-open-eisdir-error'
* js/windows-open-eisdir-error: Windows: correct detection of EISDIR in mingw_open()
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index c5c37e5..70f3191 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -312,7 +312,7 @@ int mingw_open (const char *filename, int oflags, ...)
return -1;
fd = _wopen(wfilename, oflags, mode);
- if (fd < 0 && (oflags & O_CREAT) && errno == EACCES) {
+ if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) {
DWORD attrs = GetFileAttributesW(wfilename);
if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY))
errno = EISDIR;