Merge pull request libgit2#6335 from kcsaul/fix/config-find-system-file

ethomson · web-flow · commit b34b831c97cc · 2022-07-06T23:21:30.000-04:00
Fix internal git_sysdir_find* function usage within public git_config_find* functions
diff --git a/src/libgit2/config.c b/src/libgit2/config.c
@@ -1137,7 +1137,7 @@ int git_config__find_global(git_str *path)
 
 int git_config_find_xdg(git_buf *path)
 {
-	GIT_BUF_WRAP_PRIVATE(path, git_sysdir_find_global_file, GIT_CONFIG_FILENAME_XDG);
+	GIT_BUF_WRAP_PRIVATE(path, git_sysdir_find_xdg_file, GIT_CONFIG_FILENAME_XDG);
 }
 
 int git_config__find_xdg(git_str *path)
@@ -1147,7 +1147,7 @@ int git_config__find_xdg(git_str *path)
 
 int git_config_find_system(git_buf *path)
 {
-	GIT_BUF_WRAP_PRIVATE(path, git_sysdir_find_global_file, GIT_CONFIG_FILENAME_SYSTEM);
+	GIT_BUF_WRAP_PRIVATE(path, git_sysdir_find_system_file, GIT_CONFIG_FILENAME_SYSTEM);
 }
 
 int git_config__find_system(git_str *path)

Original file line number	Diff line number	Diff line change
`@@ -1137,7 +1137,7 @@ int git_config__find_global(git_str *path)`
`1137`	`1137`
`1138`	`1138`	`int git_config_find_xdg(git_buf *path)`
`1139`	`1139`	`{`
`1140`		`- GIT_BUF_WRAP_PRIVATE(path, git_sysdir_find_global_file, GIT_CONFIG_FILENAME_XDG);`
	`1140`	`+ GIT_BUF_WRAP_PRIVATE(path, git_sysdir_find_xdg_file, GIT_CONFIG_FILENAME_XDG);`
`1141`	`1141`	`}`
`1142`	`1142`
`1143`	`1143`	`int git_config__find_xdg(git_str *path)`
`@@ -1147,7 +1147,7 @@ int git_config__find_xdg(git_str *path)`
`1147`	`1147`
`1148`	`1148`	`int git_config_find_system(git_buf *path)`
`1149`	`1149`	`{`
`1150`		`- GIT_BUF_WRAP_PRIVATE(path, git_sysdir_find_global_file, GIT_CONFIG_FILENAME_SYSTEM);`
	`1150`	`+ GIT_BUF_WRAP_PRIVATE(path, git_sysdir_find_system_file, GIT_CONFIG_FILENAME_SYSTEM);`
`1151`	`1151`	`}`
`1152`	`1152`
`1153`	`1153`	`int git_config__find_system(git_str *path)`