Merge branch 'kb/windows-wide-config'

Author: kblees

Documentation/config.txt

@@ -6,9 +6,8 @@ the Git commands' behavior. The `.git/config` file in each repository
 is used to store the configuration for that repository, and
 `$HOME/.gitconfig` is used to store a per-user configuration as
 fallback values for the `.git/config` file. The file `/etc/gitconfig`
-can be used to store a system-wide default configuration. On Windows,
-configuration can also be stored in `C:\ProgramData\Git\config`; This
-file will be used also by libgit2-based software.
+can be used to store a system-wide default configuration
+(`%PROGRAMDATA%/gitconfig` on Windows).
 
 The configuration variables are used by both the Git plumbing
 and the porcelains. The variables are divided into sections, wherein

Documentation/git-config.txt

@@ -123,6 +123,8 @@ See also <<FILES>>.
 For reading options: read only from system-wide `$(prefix)/etc/gitconfig`
 rather than from all available files.
 +
+On Windows, the system-wide config file is `%PROGRAMDATA%/gitconfig`.
++
 See also <<FILES>>.
 
 --local::
@@ -225,7 +227,7 @@ If not set explicitly with '--file', there are four files where
 'git config' will search for configuration options:
 
 $(prefix)/etc/gitconfig::
-	System-wide configuration file.
+	System-wide configuration file (`%PROGRAMDATA%/gitconfig` on Windows).
 
 $XDG_CONFIG_HOME/git/config::
 	Second user-specific configuration file. If $XDG_CONFIG_HOME is not set

Documentation/git.txt

@@ -940,7 +940,8 @@ for further details.
 
 'GIT_CONFIG_NOSYSTEM'::
 	Whether to skip reading settings from the system-wide
-	`$(prefix)/etc/gitconfig` file.  This environment variable can
+	`$(prefix)/etc/gitconfig` file (`%PROGRAMDATA%/gitconfig`
+	on Windows).  This environment variable can
 	be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a
 	predictable environment for a picky script, or you can set it
 	temporarily to avoid using a buggy `/etc/gitconfig` file while

Documentation/gitattributes.txt

@@ -84,7 +84,8 @@ for a single user should be placed in a file specified by the
 Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME
 is either not set or empty, $HOME/.config/git/attributes is used instead.
 Attributes for all users on a system should be placed in the
-`$(prefix)/etc/gitattributes` file.
+`$(prefix)/etc/gitattributes` file (`%PROGRAMDATA%/gitattributes` on
+Windows).
 
 Sometimes you would need to override an setting of an attribute
 for a path to `Unspecified` state.  This can be done by listing

config.mak.uname

@@ -330,6 +330,7 @@ endif
 ifeq ($(uname_S),Windows)
 	GIT_VERSION := $(GIT_VERSION).MSVC
 	pathsep = ;
+	sysconfdir = /etc
 	HAVE_ALLOCA_H = YesPlease
 	NO_PREAD = YesPlease
 	NEEDS_CRYPTO_WITH_SSL = YesPlease
@@ -484,6 +485,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
 endif
 ifneq (,$(findstring MINGW,$(uname_S)))
 	pathsep = ;
+	sysconfdir = /etc
 	HAVE_ALLOCA_H = YesPlease
 	NO_PREAD = YesPlease
 	NEEDS_CRYPTO_WITH_SSL = YesPlease
@@ -532,6 +534,10 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
 	htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html
 	prefix =
+	# prevent conversion to Windows path on MSys1 (see
+	# http://www.mingw.org/wiki/Posix_path_conversion)
+	ETC_GITCONFIG = //etc\gitconfig
+	ETC_GITATTRIBUTES = //etc\gitattributes
 	INSTALL = /bin/install
 	EXTLIBS += /mingw/lib/libz.a
 	NO_R_TO_GCC_LINKER = YesPlease

exec_cmd.c

@@ -15,8 +15,24 @@ char *system_path(const char *path)
 #endif
 	struct strbuf d = STRBUF_INIT;
 
-	if (is_absolute_path(path))
+	if (is_absolute_path(path)) {
+#ifdef _WIN32
+		/*
+		 * On Windows (all variants), replace '/etc' with %PROGRAMDATA%
+		 * (or %ALLUSERSPROFILE% in case of Windows XP)
+		 */
+		if (!strncmp(path, "/etc/", 5)) {
+			const char *sysconfdir = getenv("PROGRAMDATA");
+			if (!sysconfdir)
+				sysconfdir = getenv("ALLUSERSPROFILE");
+			if (sysconfdir) {
+				strbuf_addf(&d, "%s/%s", sysconfdir, path + 5);
+				return strbuf_detach(&d, NULL);
+			}
+		}
+#endif
 		return xstrdup(path);
+	}
 
 #ifdef RUNTIME_PREFIX
 	assert(argv0_path);