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

Re: [PATCH v2] sequencer.c: fix and unify error messages in rearrange_squash()

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 16, 2017, 01:52 UTC
Message-ID
<xmqqfuajuae8.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20171015170742.8395-1-ralf.thielow@gmail.com>
Ralf Thielow <ralf.thielow@gmail.com> writes:
Show 7 quoted lines
> When the write opertion fails, we write that we could
> not read. Change the error message to match the operation
> and remove the full stop at the end.
>
> When ftruncate() fails, we write that we couldn't finish
> the operation on the todo file. It is more accurate to write
> that we couldn't truncate as we do in other calls of ftruncate().
Wouldn't it be more accurate to say we couldn't ftruncate, though?
Show 22 quoted lines
>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
>  sequencer.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index e258bb646..75f5356f6 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -2948,9 +2948,9 @@ int rearrange_squash(void)
>  		if (fd < 0)
>  			res = error_errno(_("could not open '%s'"), todo_file);
>  		else if (write(fd, buf.buf, buf.len) < 0)
> -			res = error_errno(_("could not read '%s'."), todo_file);
> +			res = error_errno(_("could not write '%s'"), todo_file);
>  		else if (ftruncate(fd, buf.len) < 0)
> -			res = error_errno(_("could not finish '%s'"),
> +			res = error_errno(_("could not truncate '%s'"),
>  					   todo_file);
>  		close(fd);
>  		strbuf_release(&buf);
Previous: Ralf ThielowNext: Johannes Schindelin
Message 6 of 9 in “sequencer.c: unify error messages”
  1. sequencer.c: unify error messagesRalf Thielow, Oct 13, 2017
  2. René ScharfeOct 13, 2017
  3. Ralf ThielowOct 15, 2017
  4. Johannes SchindelinOct 15, 2017
  5. sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow, Oct 15, 2017
  6. Junio C HamanoOct 16, 2017
  7. Johannes SchindelinOct 16, 2017
  8. Philip OakleyOct 16, 2017
  9. Junio C HamanoOct 16, 2017

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.