Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B95E4C432BE for ; Mon, 26 Jul 2021 18:43:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FE3F60F6F for ; Mon, 26 Jul 2021 18:43:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232458AbhGZSCq (ORCPT ); Mon, 26 Jul 2021 14:02:46 -0400 Received: from bee.birch.relay.mailchannels.net ([23.83.209.14]:34693 "EHLO bee.birch.relay.mailchannels.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231778AbhGZSCp (ORCPT ); Mon, 26 Jul 2021 14:02:45 -0400 X-Sender-Id: dreamhost|x-authsender|novalis@novalis.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id AD2237022F7; Mon, 26 Jul 2021 18:34:19 +0000 (UTC) Received: from pdx1-sub0-mail-a52.g.dreamhost.com (100-101-162-69.trex.outbound.svc.cluster.local [100.101.162.69]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 410007026A2; Mon, 26 Jul 2021 18:34:19 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|novalis@novalis.org Received: from pdx1-sub0-mail-a52.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.101.162.69 (trex/6.3.3); Mon, 26 Jul 2021 18:34:19 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|novalis@novalis.org X-MailChannels-Auth-Id: dreamhost X-Broad-Lyrical: 7dfaa3891f33a8c3_1627324459503_558114623 X-MC-Loop-Signature: 1627324459502:2920657077 X-MC-Ingress-Time: 1627324459502 Received: from pdx1-sub0-mail-a52.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a52.g.dreamhost.com (Postfix) with ESMTP id D49DE7F9DC; Mon, 26 Jul 2021 11:34:18 -0700 (PDT) Received: from corey.lan (unknown [98.113.183.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: novalis@novalis.org) by pdx1-sub0-mail-a52.g.dreamhost.com (Postfix) with ESMTPSA id 1255D8031F; Mon, 26 Jul 2021 11:34:17 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a52 From: David Turner To: git@vger.kernel.org Cc: David Turner Subject: [PATCH 3/3] diff --submodule=diff: Don't print failure message twice Date: Mon, 26 Jul 2021 14:33:58 -0400 Message-Id: <20210726183358.3255233-3-dturner@twosigma.com> X-Mailer: git-send-email 2.11.GIT In-Reply-To: <20210726183358.3255233-1-dturner@twosigma.com> References: <20210726183358.3255233-1-dturner@twosigma.com> Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- submodule.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/submodule.c b/submodule.c index 9031527a16..0acfad3d4c 100644 --- a/submodule.c +++ b/submodule.c @@ -713,8 +713,10 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path, strvec_push(&cp.args, oid_to_hex(new_oid)); prepare_submodule_repo_env(&cp.env_array); - 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