From: Jeff King <peff@peff.net>
To: Junio C Hamano <junio@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] format-patch: notice failure to open cover letter for writing
Date: Fri, 22 Feb 2019 01:26:07 -0500 [thread overview]
Message-ID: <20190222062606.GD10248@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqlg28snv0.fsf@gitster-ct.c.googlers.com>
On Thu, Feb 21, 2019 at 03:50:11PM -0800, Junio C Hamano wrote:
> The make_cover_letter() function is supposed to open a new file for
> writing, and let the caller write into it via FILE *rev->diffopt.file
> but because the function does not return anything, the caller does not
> bother checking the return value.
>
> Make sure it dies, instead of keep going with a NULL output
> filestream and relying on it to cause a crash.
Definitely makes sense.
> diff --git a/builtin/log.c b/builtin/log.c
> index 3e145fe502..43fc9a07df 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -1047,7 +1047,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
>
> if (!use_stdout &&
> open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
> - return;
> + die(_("Failed to create cover-letter file"));
I wondered if we should be showing errno here, but it looks like
open_next_file() will give us a more specific error (including errno if
applicable).
I'd suggest s/F/f/ in the message to match our usual style, though I see
this code has a lot of capitalized errors already. :)
> +test_expect_success 'failure to write cover-letter aborts gracefully' '
> + test_when_finished "rmdir 0000-cover-letter.patch" &&
> + mkdir 0000-cover-letter.patch &&
> + test_must_fail git format-patch --no-renames --cover-letter -1
> +'
Cute test. :)
-Peff
next prev parent reply other threads:[~2019-02-22 6:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 23:50 [PATCH] format-patch: notice failure to open cover letter for writing Junio C Hamano
2019-02-22 6:26 ` Jeff King [this message]
2019-02-22 7:50 ` Duy Nguyen
2019-02-22 17:54 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190222062606.GD10248@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=junio@pobox.com \
/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.
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 NNTP newsgroup(s).