Re: [PATCH v2 2/4] setup: allow for prefix to be passed to git commands
From: Johannes Schindelin <hidden>
Date: 2017-03-14 22:28:44
Hi Brandon, On Tue, 14 Mar 2017, Brandon Williams wrote:
In a future patch child processes which act on submodules need a little more context about the original command that was invoked. This patch teaches git to use the prefix stored in `GIT_INTERNAL_TOPLEVEL_PREFIX` if another prefix wasn't found during the git directory setup process.
Missing SOB ;-)
quoted hunk ↗ jump to hunk
diff --git a/setup.c b/setup.c index 8f64fbdfb..c8492ea8a 100644 --- a/setup.c +++ b/setup.c@@ -940,8 +940,14 @@ static const char *setup_git_directory_gently_1(int *nongit_ok) const char *setup_git_directory_gently(int *nongit_ok) { const char *prefix; + const char *env_prefix;
I'd just append this to the previous line (`const char *prefix, *env_prefix`).
prefix = setup_git_directory_gently_1(nongit_ok); + env_prefix = getenv(GIT_TOPLEVEL_PREFIX_ENVIRONMENT); + + if (env_prefix) + prefix = env_prefix;
The commit message claims that env_prefix is used if no other prefix was found, but this code ignores any prefix if the environment variable was set. Which version is correct? Ciao, Johannes