undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer.c: fix and unify error messages in rearrange_squash()

Browse Source 
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().

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ralf Thielow 2017-10-15 19:07:42 +02:00 committed by Junio C Hamano
parent dfab1eac23
commit 3247edbb1a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sequencer.c
View File

@ -2926,9 +2926,9 @@ int rearrange_squash(void)
if (fd < 0) if (fd < 0)
res = error_errno(_("could not open '%s'"), todo_file); res = error_errno(_("could not open '%s'"), todo_file);
else if (write(fd, buf.buf, buf.len) < 0) 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) else if (ftruncate(fd, buf.len) < 0)
res = error_errno(_("could not finish '%s'"), res = error_errno(_("could not truncate '%s'"),
todo_file); todo_file);
close(fd); close(fd);
strbuf_release(&buf); strbuf_release(&buf);