diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:14 -0800 |
| commit | 8b5b0e8db593adfd3556fa3faa2aeb5f55e4f8b4 (patch) | |
| tree | 5382f473d8529120a811d6638f5627f8e1392982 | |
| parent | Merge branch 'km/branch-get-push-while-detached' (diff) | |
| parent | submodule.c: use GIT_DIR_ENVIRONMENT consistently (diff) | |
| download | tgif-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
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 11ff11ed89..4c4f033e8a 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); } /* |