summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Strickroth <email@cs-ware.de>2019-06-28 17:05:57 +0200
committerEdward Thomson <ethomson@edwardthomson.com>2022-01-17 22:02:12 -0500
commitf3c1bedfa2e5564c60fd6910eace4a44abdf9777 (patch)
treecf78e7f5a12bc13b09d55103079423d04d886cf9
parentf64568ebcb8a5c5be9dcda2a016692edae42a507 (diff)
downloadlibgit2-f3c1bedfa2e5564c60fd6910eace4a44abdf9777.tar.gz
Detect installed x64 versions of Git for Windows
Signed-off-by: Sven Strickroth <email@cs-ware.de>
-rw-r--r--src/win32/findfile.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/win32/findfile.c b/src/win32/findfile.c
index d5dba8c41..0dcce148c 100644
--- a/src/win32/findfile.c
+++ b/src/win32/findfile.c
@@ -191,6 +191,12 @@ int git_win32__find_system_dirs(git_str *out, const wchar_t *subdir)
&buf, HKEY_CURRENT_USER, REG_MSYSGIT_INSTALL_LOCAL, subdir) && buf.size)
git_str_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr);
+#ifdef GIT_ARCH_64
+ if (!win32_find_git_in_registry(
+ &buf, HKEY_LOCAL_MACHINE, REG_MSYSGIT_INSTALL_LOCAL, subdir) && buf.size)
+ git_str_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr);
+#endif
+
if (!win32_find_git_in_registry(
&buf, HKEY_LOCAL_MACHINE, REG_MSYSGIT_INSTALL, subdir) && buf.size)
git_str_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr);