diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-17 13:29:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-17 13:29:19 +0900 |
| commit | d1114d87c73c78a936975bef5f15e2cde639336d (patch) | |
| tree | dd9a4e313f8d61c55940281a4a13db5fdf4a9bec | |
| parent | 4339c9f2dfa7d8e100e83876f5f8c6da0dd4e179 (diff) | |
| parent | 3247edbb1a8218f9c65f09a25d46572b224d096b (diff) | |
| download | git-d1114d87c73c78a936975bef5f15e2cde639336d.tar.gz | |
Merge branch 'js/rebase-i-final'
Error message fix.
* js/rebase-i-final:
sequencer.c: fix and unify error messages in rearrange_squash()
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index e258bb6469..75f5356f69 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); |