[PATCH v2] sequencer.c: fix and unify error messages in rearrange_squash()
- From
Ralf Thielow <ralf.thielow@gmail.com>
- Date
- Oct 15, 2017, 17:07 UTC
- Message-ID
- <20171015170742.8395-1-ralf.thielow@gmail.com>
- In-Reply-To
- <20171013175157.13634-1-ralf.thielow@gmail.com>
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> --- 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);
-- 2.15.0.rc0.296.g7b26d72