Re: [PATCH 2/5] submodule_move_head: prepare env for child correctly

From: Junio C Hamano <gitster@pobox.com>
Date: May 2, 2017, 02:04 UTC
Message-ID: <xmqqy3ugdnfu.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170501180058.8063-3-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

Show 6 quoted lines

> We forgot to prepare the submodule env, which is only a problem for
> nested submodules. See 2e5d6503bd (ls-files: fix recurse-submodules
> with nested submodules, 2017-04-13) for further explanation.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---

Sounds good (if only because this makes it similar to other codepaths).

Is this something whose breakage before the patch is easily demonstrated with a test?

Show 15 quoted lines

>  submodule.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/submodule.c b/submodule.c
> index cd098cf12b..c7a7a33916 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -1476,6 +1476,7 @@ int submodule_move_head(const char *path,
>  			cp.no_stdin = 1;
>  			cp.dir = path;
>  
> +			prepare_submodule_repo_env(&cp.env_array);
>  			argv_array_pushl(&cp.args, "update-ref", "HEAD", new, NULL);
>  
>  			if (run_command(&cp)) {