MSVC: include compat/win32/path-utils.h for MSVC, too, for real_path()
A path such as 'c:/somepath/submodule/../.git/modules/submodule' wasn't resolved correctly any more, because the *nix variant of offset_1st_component is used instead of the Win32 specific version. Regression was introduced in commit 1cadad6f6 when mingw_offset_1st_component was moved from mingw.c which is included by msvc.c to a separate file. Then, the new file "compat/win32/path-utils.h" was only included for the __CYGWIN__ and __MINGW32__ cases in git-compat-util.h, the case for _MSC_VER was missing. Signed-off-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sven Strickroth committed
Apr 8, 2019 at 13:26 UTC
22c3634c0f92662f995e1e97db7f65bb39352080
2 files changed
+2
config.mak.uname
+1
@@ -392,6 +392,7 @@ ifeq ($(uname_S),Windows)
392
CFLAGS =
393
BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
394
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
395
+ compat/win32/path-utils.o \
396
compat/win32/pthread.o compat/win32/syslog.o \
397
compat/win32/dirent.o
398
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
git-compat-util.h
+1
@@ -197,6 +197,7 @@
197
#include "compat/win32/path-utils.h"
198
#include "compat/mingw.h"
199
#elif defined(_MSC_VER)
200
+#include "compat/win32/path-utils.h"
201
#include "compat/msvc.h"
202
#else
203
#include <sys/utsname.h>