From: Junio C Hamano <junkio@cox.net>
Date: Sun, 18 Feb 2007 02:12:46 +0000 (-0800)
Subject: Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
X-Git-Tag: v1.5.1-rc1~258^3~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=700ea47936e393a217f4174f80a19aa01f698b56;p=git.git

Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-apply.c b/builtin-apply.c
index fc1d6730d..2784db2ef 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2601,11 +2601,9 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
 
 	prefix = setup_git_directory_gently(&is_not_gitdir);
 	prefix_length = prefix ? strlen(prefix) : 0;
-	if (!is_not_gitdir) {
-		git_config(git_apply_config);
-		if (apply_default_whitespace)
-			parse_whitespace_option(apply_default_whitespace);
-	}
+	git_config(git_apply_config);
+	if (apply_default_whitespace)
+		parse_whitespace_option(apply_default_whitespace);
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];