Merge pull request libgit2#1680 from csware/win32-junction

arrbee · arrbee · commit 22ef0c28571d · 2013-06-25T09:40:10.000-07:00
Correctly handle win32 junctions
diff --git a/src/fileops.c b/src/fileops.c
@@ -350,8 +350,7 @@ int git_futils_mkdir(
 			int tmp_errno = errno;
 
 			/* ignore error if directory already exists */
-			if (p_stat(make_path.ptr, &st) < 0 ||
-				!(S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode))) {
+			if (p_stat(make_path.ptr, &st) < 0 || !S_ISDIR(st.st_mode)) {
 				errno = tmp_errno;
 				giterr_set(GITERR_OS, "Failed to make directory '%s'", make_path.ptr);
 				goto done;
diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c
@@ -90,6 +90,9 @@ static int do_lstat(
 		if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
 			fMode |= S_IFLNK;
 
+		if ((fMode & (S_IFDIR | S_IFLNK)) == (S_IFDIR | S_IFLNK)) // junction
+			fMode ^= S_IFLNK;
+
 		buf->st_ino = 0;
 		buf->st_gid = 0;
 		buf->st_uid = 0;
