Re: [PATCH 7/7] setup_git_env: avoid blind fall-back to ".git"
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Nov 22, 2016, 00:44 UTC
- Message-ID
- <20161122004421.GA12263@google.com>
- In-Reply-To
- <20161020062430.rxupwheaeydtcvf3@sigill.intra.peff.net>
Hi,
Jeff King wrote:
Show 27 quoted lines
> This passes the test suite (after the adjustments in the
> previous patches), but there's a risk of regression for any
> cases where the fallback usually works fine but the code
> isn't exercised by the test suite. So by itself, this
> commit is a potential step backward, but lets us take two
> steps forward once we've identified and fixed any such
> instances.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> environment.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/environment.c b/environment.c
> index cd5aa57..b1743e6 100644
> --- a/environment.c
> +++ b/environment.c
> @@ -164,8 +164,11 @@ static void setup_git_env(void)
> const char *replace_ref_base;
>
> git_dir = getenv(GIT_DIR_ENVIRONMENT);
> - if (!git_dir)
> + if (!git_dir) {
> + if (!startup_info->have_repository)
> + die("BUG: setup_git_env called without repository");
> git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
> + }This trips reproducibly for
git ls-remote https://kernel.googlesource.com/pub/scm/git/git
when run outside of a git repository.
Backtrace:
#0 setup_git_env () at environment.c:172 #1 get_git_dir () at environment.c:214 #2 get_helper at transport-helper.c:127 #3 get_refs_list (for_push=0) at transport-helper.c:1038 #4 transport_get_remote_refs at transport.c:1076 #5 cmd_ls_remote at builtin/ls-remote.c:97
transport-helper.c:127 is
argv_array_pushf(&helper->env_array, "%s=%s", GIT_DIR_ENVIRONMENT, get_git_dir());
That code is pretty clearly wrong. Should it be made conditional on have_git_dir(), like this?
Thanks, Jonathan
transport-helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c index 91aed35..e4fd982 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -124,8 +124,9 @@ static struct child_process *get_helper(struct transport *transport) helper->git_cmd = 0; helper->silent_exec_failure = 1; - argv_array_pushf(&helper->env_array, "%s=%s", GIT_DIR_ENVIRONMENT, - get_git_dir()); + if (have_git_dir()) + argv_array_pushf(&helper->env_array, "%s=%s", + GIT_DIR_ENVIRONMENT, get_git_dir()); code = start_command(helper); if (code < 0 && errno == ENOENT)