mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 21:07:52 +01:00
Code Activity

Merge branch 'js/rebase-i-final'

Browse source 
Error message fix.

* js/rebase-i-final:
  sequencer.c: fix and unify error messages in rearrange_squash()
This commit is contained in:
Junio C Hamano 2017-10-17 13:29:19 +09:00
commit d1114d87c7
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

@ -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);