aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-17 18:12:46 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-18 00:54:04 -0800
commit700ea47936e393a217f4174f80a19aa01f698b56 (patch)
tree1d5a9912aa61dfa3e5bc999ee939693a000115e7 /builtin-apply.c
parentdc7b24364dcbe9ab74d937c92af9999ac1a2db0b (diff)
downloadgit-700ea47936e393a217f4174f80a19aa01f698b56.tar.gz
git-700ea47936e393a217f4174f80a19aa01f698b56.tar.xz
Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c8
1 files changed, 3 insertions, 5 deletions
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];