Merge pull request #2370 from dscho/prettify-etc-gitconfig-path

dscho · Git for Windows Build Agent · commit 9db8a6bbba3e · 2019-10-30T07:21:15.000Z
config: normalize the path of the system gitconfig
diff --git a/config.c b/config.c
@@ -1662,9 +1662,11 @@ static int git_config_from_blob_ref(config_fn_t fn,
 
 const char *git_etc_gitconfig(void)
 {
-	static const char *system_wide;
-	if (!system_wide)
+	static char *system_wide;
+	if (!system_wide) {
 		system_wide = system_path(ETC_GITCONFIG);
+		normalize_path_copy(system_wide, system_wide);
+	}
 	return system_wide;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1662,9 +1662,11 @@ static int git_config_from_blob_ref(config_fn_t fn,`
`1662`	`1662`
`1663`	`1663`	`const char *git_etc_gitconfig(void)`
`1664`	`1664`	`{`
`1665`		`- static const char *system_wide;`
`1666`		`- if (!system_wide)`
	`1665`	`+ static char *system_wide;`
	`1666`	`+ if (!system_wide) {`
`1667`	`1667`	`system_wide = system_path(ETC_GITCONFIG);`
	`1668`	`+ normalize_path_copy(system_wide, system_wide);`
	`1669`	`+ }`
`1668`	`1670`	`return system_wide;`
`1669`	`1671`	`}`
`1670`	`1672`