git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 31, 2021, 06:19 UTC
Message-ID
<xmqqo89exhjm.fsf@gitster.g>
In-Reply-To
<20210802170004.4103535-3-dturner@twosigma.com>
David Turner <dturner@twosigma.com> writes:
Show 25 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);
Makes sense.
Previous: David Turner
Message 5 of 5 in “Remove unused var”
  1. 1/3 Remove unused varDavid Turner, Aug 2, 2021
  2. 2/3 diff --submodule=diff: do not fail on ever-initialied deleted submodulesDavid Turner, Aug 2, 2021
  3. Junio C HamanoAug 31, 2021
  4. 3/3 diff --submodule=diff: Don't print failure message twiceDavid Turner, Aug 2, 2021
  5. Junio C HamanoAug 31, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.