Re: [PATCH v3 3/3] diff --submodule=diff: Don't print failure message twice

From: David Turner <novalis@novalis.org>
Date: Aug 30, 2021, 13:45 UTC
Message-ID: <d14d2c180f59b9115754318e4d3567a404769d06.camel@novalis.org>
In-Reply-To: <20210812001332.715876-3-dturner@twosigma.com>

I keep seeing these as "will merge to next?" in the "what's cooking" emails. But I don't see any direct replies, and they don't seem to be merged. Is there something I need to do to get these merged?

Thanks.

On Wed, 2021-08-11 at 20:13 -0400, David Turner wrote:

Show 28 quoted lines

> When we fail to start a diff command inside a submodule, immediately
> exit the routine rather than trying to finish the command and
> printing
> a second message.
> 
> Signed-off-by: David Turner <dturner@twosigma.com>
> ---
>  submodule.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/submodule.c b/submodule.c
> index d13d103975..2e98e840af 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -720,8 +720,10 @@ void show_submodule_inline_diff(struct
> diff_options *o, const char *path,
>                 strvec_push(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT
> "=.");
>         }
>  
> -       if (start_command(&cp))
> +       if (start_command(&cp)) {
>                 diff_emit_submodule_error(o, "(diff failed)\n");
> +               goto done;
> +       }
>  
>         while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
>                 diff_emit_submodule_pipethrough(o, sb.buf, sb.len);