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

dscho · Git for Windows Build Agent · commit 805764851da1 · 2019-10-28T05:27:59.000Z
config: normalize the path of the system gitconfig
diff --git a/config.c b/config.c
@@ -1657,9 +1657,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
`@@ -1657,9 +1657,11 @@ static int git_config_from_blob_ref(config_fn_t fn,`
`1657`	`1657`
`1658`	`1658`	`const char *git_etc_gitconfig(void)`
`1659`	`1659`	`{`
`1660`		`- static const char *system_wide;`
`1661`		`- if (!system_wide)`
	`1660`	`+ static char *system_wide;`
	`1661`	`+ if (!system_wide) {`
`1662`	`1662`	`system_wide = system_path(ETC_GITCONFIG);`
	`1663`	`+ normalize_path_copy(system_wide, system_wide);`
	`1664`	`+ }`
`1663`	`1665`	`return system_wide;`
`1664`	`1666`	`}`
`1665`	`1667`