From 5f0eeb459b6e027796dcecf4bd3a6e50ab7c6eb2 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 2 Jun 2010 00:41:33 +0200
Subject: [PATCH] Add a Windows-specific fallback to getenv("HOME");

This fixes msysGit issue 482 properly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/config.c  |  4 ++--
 compat/mingw.c    | 18 ++++++++++++++++++
 compat/mingw.h    |  3 +++
 config.c          |  2 +-
 git-compat-util.h |  4 ++++
 path.c            |  2 +-
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/builtin/config.c b/builtin/config.c
index d35c06ae51..723703464f 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -164,7 +164,7 @@ static int get_value(const char *key_, const char *regex_)
 
 	local = config_exclusive_filename;
 	if (!local) {
-		const char *home = getenv("HOME");
+		const char *home = get_home_directory();
 		local = repo_config = git_pathdup("config");
 		if (home)
 			global = xstrdup(mkpath("%s/.gitconfig", home));
@@ -363,7 +363,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 	}
 
 	if (use_global_config) {
-		char *home = getenv("HOME");
+		char *home = get_home_directory();
 		if (home) {
 			char *user_config = xstrdup(mkpath("%s/.gitconfig", home));
 			config_exclusive_filename = user_config;
diff --git a/compat/mingw.c b/compat/mingw.c
index 665f6abc40..e5f1c36995 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1828,3 +1828,21 @@ pid_t waitpid(pid_t pid, int *status, int options)
 	errno = EINVAL;
 	return -1;
 }
+
+const char *get_windows_home_directory()
+{
+	static const char *home_directory = NULL;
+	struct strbuf buf = STRBUF_INIT;
+
+	if (home_directory)
+		return home_directory;
+
+	home_directory = getenv("HOME");
+	if (home_directory && *home_directory)
+		return home_directory;
+
+	strbuf_addf(&buf, "%s/%s", getenv("HOMEDRIVE"), getenv("HOMEPATH"));
+	home_directory = strbuf_detach(&buf, NULL);
+
+	return home_directory;
+}
diff --git a/compat/mingw.h b/compat/mingw.h
index 4acdac969d..4285272452 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -355,3 +355,6 @@ static int mingw_main(c,v)
  * Used by Pthread API implementation for Windows
  */
 extern int err_win_to_posix(DWORD winerr);
+
+extern const char *get_windows_home_directory();
+#define get_home_directory() get_windows_home_directory()
diff --git a/config.c b/config.c
index b6dcfa8f2e..298bbcf2e5 100644
--- a/config.c
+++ b/config.c
@@ -897,7 +897,7 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
 		found += 1;
 	}
 
-	home = getenv("HOME");
+	home = get_home_directory();
 	if (home) {
 		char buf[PATH_MAX];
 		char *user_config = mksnpath(buf, sizeof(buf), "%s/.gitconfig", home);
diff --git a/git-compat-util.h b/git-compat-util.h
index 11d68b1104..4f9186559a 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -581,4 +581,8 @@ int remove_or_warn(unsigned int mode, const char *path);
 #define mark_as_git_dir(x) /* noop */
 #endif
 
+#ifndef get_home_directory
+#define get_home_directory() getenv("HOME")
+#endif
+
 #endif
diff --git a/path.c b/path.c
index b6f71d1086..9e5bf53ea8 100644
--- a/path.c
+++ b/path.c
@@ -240,7 +240,7 @@ char *expand_user_path(const char *path)
 		const char *username = path + 1;
 		size_t username_len = first_slash - username;
 		if (username_len == 0) {
-			const char *home = getenv("HOME");
+			const char *home = get_home_directory();
 			if (!home)
 				goto return_null;
 			strbuf_add(&user_path, home, strlen(home));
-- 
2.11.4.GIT