Update Scintilla to version 3.5.7
[TortoiseGit.git] / ext / libgit2-0007-Allow-to-use-PROGRAMDATA-Git-config-file.patch
blob03948d492842d91724f18a0c7602c03d1fa6d1df
1 From 4ba2ba113c65196cbd2aba1ce85e01f310a53314 Mon Sep 17 00:00:00 2001
2 From: Sven Strickroth <email@cs-ware.de>
3 Date: Sat, 20 Jun 2015 17:00:03 +0200
4 Subject: [PATCH] Allow to use %PROGRAMDATA%\Git\config file
6 Signed-off-by: Sven Strickroth <email@cs-ware.de>
7 ---
8 src/config.c | 3 +++
9 1 file changed, 3 insertions(+)
11 diff --git a/src/config.c b/src/config.c
12 index d116a9d..ed36f8a 100644
13 --- a/src/config.c
14 +++ b/src/config.c
15 @@ -1083,6 +1083,9 @@ int git_config_find_xdg(git_buf *path)
16 int git_config_find_system(git_buf *path)
18 git_buf_sanitize(path);
19 + /* system config in %PROGRAMDATA%\Git on win32 is named config, see https://github.com/git-for-windows/git/commit/ba8c0399e60807f08f73ce6a394c72c261eb96ce */
20 + if (!git_sysdir_find_system_file(path, "config"))
21 + return 0;
22 return git_sysdir_find_system_file(path, GIT_CONFIG_FILENAME_SYSTEM);
25 --
26 1.9.5.msysgit.1