summaryrefslogtreecommitdiffstats
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-08 18:17:00 +0200
committerJunio C Hamano <gitster@pobox.com>2010-09-08 18:17:00 +0200
commit6b948a7a480b4ad5e112eb1642e9160e2a3b4f2b (patch)
treea67164e17aaba73228e2b2aeed996e36209a57a1 /environment.c
parentMerge branch 'en/d-f-conflict-fix' (diff)
parentdo not pass "git -c foo=bar" params to transport helpers (diff)
downloadgit-6b948a7a480b4ad5e112eb1642e9160e2a3b4f2b.tar.xz
git-6b948a7a480b4ad5e112eb1642e9160e2a3b4f2b.zip
Merge branch 'jk/maint-pass-c-config-in-env'
* jk/maint-pass-c-config-in-env: do not pass "git -c foo=bar" params to transport helpers pass "git -c foo=bar" params through environment
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index eeb26876a1..9425606443 100644
--- a/environment.c
+++ b/environment.c
@@ -73,6 +73,7 @@ static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;
const char * const local_repo_env[LOCAL_REPO_ENV_SIZE + 1] = {
ALTERNATE_DB_ENVIRONMENT,
CONFIG_ENVIRONMENT,
+ CONFIG_DATA_ENVIRONMENT,
DB_ENVIRONMENT,
GIT_DIR_ENVIRONMENT,
GIT_WORK_TREE_ENVIRONMENT,