diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-19 20:51:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 20:51:40 (GMT) |
| commit | 4c10c311376ef0cd279dace6a05e2101d60536e4 (patch) | |
| tree | ec064683eb50abc2ce62808b7de80197a439c2cb /submodule.c | |
| parent | 79b51ebf6f65d4af95e181dcf98d6fe0a3baa631 (diff) | |
| parent | 10f5c526561604ba9677dc27643b5c9bfad36458 (diff) | |
| download | git-4c10c311376ef0cd279dace6a05e2101d60536e4.zip git-4c10c311376ef0cd279dace6a05e2101d60536e4.tar.gz git-4c10c311376ef0cd279dace6a05e2101d60536e4.tar.bz2 | |
Merge branch 'jc/submodule-anchor-git-dir' into maint
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 1b5cdfb..e8258f0 100644 --- a/submodule.c +++ b/submodule.c @@ -1160,4 +1160,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"); } |