From: David Turner <dturner@twosigma.com>
To: git@vger.kernel.org, novalis@novalis.org
Cc: David Turner <dturner@twosigma.com>
Subject: [PATCH v2 3/3] diff --submodule=diff: Don't print failure message twice
Date: Mon, 2 Aug 2021 13:00:04 -0400 [thread overview]
Message-ID: <20210802170004.4103535-3-dturner@twosigma.com> (raw)
In-Reply-To: <20210802170004.4103535-1-dturner@twosigma.com>
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);
--
2.11.GIT
next prev parent reply other threads:[~2021-08-02 17:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 17:00 [PATCH v2 1/3] Remove unused var David Turner
2021-08-02 17:00 ` [PATCH v2 2/3] diff --submodule=diff: do not fail on ever-initialied deleted submodules David Turner
2021-08-31 6:19 ` Junio C Hamano
2021-08-02 17:00 ` David Turner [this message]
2021-08-31 6:19 ` [PATCH v2 3/3] diff --submodule=diff: Don't print failure message twice Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210802170004.4103535-3-dturner@twosigma.com \
--to=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=novalis@novalis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).