summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorSven Strickroth <email@cs-ware.de>2019-04-08 11:26:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-09 11:40:07 (GMT)
commit22c3634c0f92662f995e1e97db7f65bb39352080 (patch)
tree2e4867db97927baea8849ffae17f3b2d9a12ad5b /git-compat-util.h
parent1cadad6f658bfb3ab54b25dd04bac372253473b6 (diff)
downloadgit-22c3634c0f92662f995e1e97db7f65bb39352080.zip
git-22c3634c0f92662f995e1e97db7f65bb39352080.tar.gz
git-22c3634c0f92662f995e1e97db7f65bb39352080.tar.bz2
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>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 925a8ae..df9cc8c 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -197,6 +197,7 @@
#include "compat/win32/path-utils.h"
#include "compat/mingw.h"
#elif defined(_MSC_VER)
+#include "compat/win32/path-utils.h"
#include "compat/msvc.h"
#else
#include <sys/utsname.h>