diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-12 22:34:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-12 22:34:34 (GMT) |
| commit | 293c232ab1dcfa08d650fa9c21377b1ef7b447dc (patch) | |
| tree | f637793399e0a9113e44d70ece105316a4613e0d /submodule.c | |
| parent | 368332c471d28f8e301c61e47bbcb81f5ebbd8fd (diff) | |
| parent | 10f5c526561604ba9677dc27643b5c9bfad36458 (diff) | |
| download | git-293c232ab1dcfa08d650fa9c21377b1ef7b447dc.zip git-293c232ab1dcfa08d650fa9c21377b1ef7b447dc.tar.gz git-293c232ab1dcfa08d650fa9c21377b1ef7b447dc.tar.bz2 | |
Merge branch 'jc/submodule-anchor-git-dir'
Having a submodule whose ".git" repository is somehow corrupt
caused a few commands that recurse into submodules loop forever.
* jc/submodule-anchor-git-dir:
submodule: avoid auto-discovery in prepare_submodule_repo_env()
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c index 5a62aa2..0ef2ff4 100644 --- a/submodule.c +++ b/submodule.c @@ -1280,4 +1280,5 @@ 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"); } |