diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-11-15 15:01:32 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-15 16:59:46 -0800 |
| commit | 5e1e6b93d024b5a01f4e957a2bedba899cb22f68 (patch) | |
| tree | 9342f5a6601475df6c95c02eaeb18aa337dc6a34 /builtin | |
| parent | f0c7fd49c0b9454808486e8c56cd3d9c022d56f2 (diff) | |
| download | git-5e1e6b93d024b5a01f4e957a2bedba899cb22f68.tar.gz | |
revert: prettify fatal messages
Some of the fatal messages printed by revert and cherry-pick look ugly
like the following:
fatal: Could not open .git/sequencer/todo.: No such file or directory
The culprit here is that these callers of the die_errno() function did not
take it into account that the message string they give to it is followed
by ": <strerror>", hence the message typically should not end with the
full-stop.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/revert.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 87df70edc3..b61c8e5c52 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -331,7 +331,7 @@ static void write_message(struct strbuf *msgbuf, const char *filename) int msg_fd = hold_lock_file_for_update(&msg_file, filename, LOCK_DIE_ON_ERROR); if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0) - die_errno(_("Could not write to %s."), filename); + die_errno(_("Could not write to %s"), filename); strbuf_release(msgbuf); if (commit_lock_file(&msg_file) < 0) die(_("Error wrapping up %s"), filename); @@ -767,7 +767,7 @@ static void read_populate_todo(struct commit_list **todo_list, fd = open(todo_file, O_RDONLY); if (fd < 0) - die_errno(_("Could not open %s."), todo_file); + die_errno(_("Could not open %s"), todo_file); if (strbuf_read(&buf, fd, 0) < 0) { close(fd); strbuf_release(&buf); @@ -845,7 +845,7 @@ static int create_seq_dir(void) if (file_exists(seq_dir)) return error(_("%s already exists."), seq_dir); else if (mkdir(seq_dir, 0777) < 0) - die_errno(_("Could not create sequencer directory '%s'."), seq_dir); + die_errno(_("Could not create sequencer directory %s"), seq_dir); return 0; } @@ -859,7 +859,7 @@ static void save_head(const char *head) fd = hold_lock_file_for_update(&head_lock, head_file, LOCK_DIE_ON_ERROR); strbuf_addf(&buf, "%s\n", head); if (write_in_full(fd, buf.buf, buf.len) < 0) - die_errno(_("Could not write to %s."), head_file); + die_errno(_("Could not write to %s"), head_file); if (commit_lock_file(&head_lock) < 0) die(_("Error wrapping up %s."), head_file); } @@ -876,7 +876,7 @@ static void save_todo(struct commit_list *todo_list, struct replay_opts *opts) die(_("Could not format %s."), todo_file); if (write_in_full(fd, buf.buf, buf.len) < 0) { strbuf_release(&buf); - die_errno(_("Could not write to %s."), todo_file); + die_errno(_("Could not write to %s"), todo_file); } if (commit_lock_file(&todo_lock) < 0) { strbuf_release(&buf); |