Re: [PATCH v2 2/4] setup: allow for prefix to be passed to git commands

From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Brandon Williams <bmwill@google.com>
Cc: git@vger.kernel.org, sbeller@google.com, gitster@pobox.com,
	peff@peff.net, pclouds@gmail.com
Subject: Re: [PATCH v2 2/4] setup: allow for prefix to be passed to git commands
Date: Tue, 14 Mar 2017 23:28:24 +0100 (CET)	[thread overview]
Message-ID: <alpine.DEB.2.20.1703142326460.3767@virtualbox> (raw)
In-Reply-To: <20170314221100.24856-3-bmwill@google.com>

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 ;-)

> 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