[PATCH] is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 30, 2010, 20:30 UTC
- Message-ID
- <7viqajmj2w.fsf_-_@alter.siamese.dyndns.org>
- In-Reply-To
- <7vvdejmjaj.fsf@alter.siamese.dyndns.org>
Even when the environment was given for the top-level process, checking in the submodule work tree should use the index file associated with the work tree of the submodule. Do not export it to the environment.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
* This seems to pass all the tests, so I'm inclined to push it out as a part of 1.7.0-rc1. There might be some other enviroment variables we shouldn't be leaking out to the submodule environment, but that can be spotted and fixed in later patches before the final.
submodule.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/submodule.c b/submodule.c index ca0527f..6f7c210 100644 --- a/submodule.c +++ b/submodule.c @@ -126,7 +126,7 @@ int is_submodule_modified(const char *path) "--porcelain", NULL, }; - char *env[3]; + char *env[4]; struct strbuf buf = STRBUF_INIT; strbuf_addf(&buf, "%s/.git/", path); @@ -142,7 +142,9 @@ int is_submodule_modified(const char *path) env[0] = strbuf_detach(&buf, NULL); strbuf_addf(&buf, "GIT_DIR=%s/.git", path); env[1] = strbuf_detach(&buf, NULL); - env[2] = NULL; + strbuf_addf(&buf, "GIT_INDEX_FILE"); + env[2] = strbuf_detach(&buf, NULL); + env[3] = NULL; memset(&cp, 0, sizeof(cp)); cp.argv = argv; @@ -161,6 +163,7 @@ int is_submodule_modified(const char *path) free(env[0]); free(env[1]); + free(env[2]); strbuf_release(&buf); return len != 0; }
-- 1.7.0.rc1.141.gbc8ce