aboutsummaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:14 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:14 -0800
commit8b5b0e8db593adfd3556fa3faa2aeb5f55e4f8b4 (patch)
tree5382f473d8529120a811d6638f5627f8e1392982 /submodule.c
parentb85f79c7dd35b495ce94bf58b61832c6030751cf (diff)
parentc5f3cba1266dc4feb4101f85e5596912fdb10d5b (diff)
downloadgit-8b5b0e8db593adfd3556fa3faa2aeb5f55e4f8b4.tar.gz
git-8b5b0e8db593adfd3556fa3faa2aeb5f55e4f8b4.tar.xz
Merge branch 'sb/submodule-cleanup-export-git-dir-env'
Code cleanup. * sb/submodule-cleanup-export-git-dir-env: submodule.c: use GIT_DIR_ENVIRONMENT consistently
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c
index 11ff11ed8..4c4f033e8 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1379,7 +1379,8 @@ void prepare_submodule_repo_env(struct argv_array *out)
if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))
argv_array_push(out, *var);
}
- argv_array_push(out, "GIT_DIR=.git");
+ argv_array_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT,
+ DEFAULT_GIT_DIR_ENVIRONMENT);
}
/*