From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 263671F453 for ; Wed, 31 Oct 2018 10:16:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728151AbeJaTNf (ORCPT ); Wed, 31 Oct 2018 15:13:35 -0400 Received: from smtp-out-6.talktalk.net ([62.24.135.70]:57097 "EHLO smtp-out-6.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728056AbeJaTNe (ORCPT ); Wed, 31 Oct 2018 15:13:34 -0400 Received: from lindisfarne.localdomain ([92.22.32.73]) by smtp.talktalk.net with SMTP id HnXagXodRpXFjHnXfgCXr2; Wed, 31 Oct 2018 10:16:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=talktalk.net; s=cmr1711; t=1540980964; bh=yiV+rGxaQqQbbgXMjd/he6CGkjrVB2KKXu+hBZOTu2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=hBfdRadjSsW7xC/ZFK6xud3O3XMiiWsVz8uNuj+ZqV1sPydXdhvbCMa4NVy/k9vvG /EX2397AWjsulWJXQJV1BgmMLln0uLgDj6PMWeXMnW02cLfVyM/uoa9gU9BwrrbVKo 2R8xSZrhoGPyzZRoym4R0OFbtTvDwg6Os/Kn5f14= X-Originating-IP: [92.22.32.73] X-Spam: 0 X-OAuthority: v=2.3 cv=Ob228CbY c=1 sm=1 tr=0 a=w3K0eKD2tyZHkEydg3BQCA==:117 a=w3K0eKD2tyZHkEydg3BQCA==:17 a=evINK-nbAAAA:8 a=BCjA09oAAAAA:8 a=1ulBX1ryXkBVU36sZhAA:9 a=Z5tHxQ38kdD2Mam8:21 a=iSUq80Ko9vD66vLc:21 a=RfR_gqz1fSpA9VikTjo0:22 a=jYKBPJSq9nmHKCndOPe9:22 From: Phillip Wood To: Git Mailing List , Junio C Hamano Cc: Eric Sunshine , Johannes Schindelin , Phillip Wood Subject: [PATCH v4 1/5] am: don't die in read_author_script() Date: Wed, 31 Oct 2018 10:15:52 +0000 Message-Id: <20181031101556.27169-2-phillip.wood@talktalk.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181031101556.27169-1-phillip.wood@talktalk.net> References: <20180912101029.28052-1-phillip.wood@talktalk.net> <20181031101556.27169-1-phillip.wood@talktalk.net> MIME-Version: 1.0 Reply-To: Phillip Wood Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4wfPCMIQe1tnsPciWoYI8tnnfr0BF7Fo8c5YHlT+rSP0hRxBbQMwuDV3VqNHPTXSEKuNRZdMGw1TlvpAlhLxvHXvEtGawuZJoycvxVDZoknzCvKgNqELag 5Hj1HCbAbQLS3BqmxXGqnvj49A6XmuayQpmc7NiXWPsQZbyOFLjtKh5O1jhirGcs08Ijue0Wz4f+6CKZtrCVknkbQaj4WxjT83sE99Dkknd+vefwMcjpgamA cT+uqeK+MvuSDxp+HJAI0B61N+HZXhaP8+2wQgR2PVHP1qUEOSTLTAenyKv/3wwkOFedyHZAZPHIvUro8l04OLxw1hepY1F1q1N7/XMtX10= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Phillip Wood The caller is already prepared to handle errors returned from this function so there is no need for it to die if it cannot read the file. Suggested-by: Eric Sunshine Signed-off-by: Phillip Wood --- builtin/am.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/am.c b/builtin/am.c index 5e866d17c7..b68578bc3f 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -318,7 +318,8 @@ static int read_author_script(struct am_state *state) if (fd < 0) { if (errno == ENOENT) return 0; - die_errno(_("could not open '%s' for reading"), filename); + return error_errno(_("could not open '%s' for reading"), + filename); } strbuf_read(&buf, fd, 0); close(fd); -- 2.19.1