kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sequencer: quote filenames in error messages 

This makes the code consistent by fixing quite a couple of error messages.

Suggested by Jakub Narębski.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2016-10-21 14:26:21 +02:00 committed by Junio C Hamano
parent c28cbc5ea6
commit f7ed1953d8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sequencer.c
View File

@ -252,7 +252,7 @@ static int write_message(const void *buf, size_t len, const char *filename,
} }
if (commit_lock_file(&msg_file) < 0) { if (commit_lock_file(&msg_file) < 0) {
rollback_lock_file(&msg_file); rollback_lock_file(&msg_file);
return error(_("Error wrapping up %s."), filename); return error(_("Error wrapping up '%s'."), filename);
} }


return 0; return 0;
@ -954,16 +954,16 @@ static int read_populate_todo(struct todo_list *todo_list,
strbuf_reset(&todo_list->buf); strbuf_reset(&todo_list->buf);
fd = open(todo_file, O_RDONLY); fd = open(todo_file, O_RDONLY);
if (fd < 0) if (fd < 0)
return error_errno(_("Could not open %s"), todo_file); return error_errno(_("Could not open '%s'"), todo_file);
if (strbuf_read(&todo_list->buf, fd, 0) < 0) { if (strbuf_read(&todo_list->buf, fd, 0) < 0) {
close(fd); close(fd);
return error(_("Could not read %s."), todo_file); return error(_("Could not read '%s'."), todo_file);
} }
close(fd); close(fd);


res = parse_insn_buffer(todo_list->buf.buf, todo_list); res = parse_insn_buffer(todo_list->buf.buf, todo_list);
if (res) if (res)
return error(_("Unusable instruction sheet: %s"), todo_file); return error(_("Unusable instruction sheet: '%s'"), todo_file);


if (!is_rebase_i(opts)) { if (!is_rebase_i(opts)) {
enum todo_command valid = enum todo_command valid =
@ -1054,7 +1054,7 @@ static int read_populate_opts(struct replay_opts *opts)
* are pretty certain that it is syntactically correct. * are pretty certain that it is syntactically correct.
*/ */
if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0) if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0)
return error(_("Malformed options sheet: %s"), return error(_("Malformed options sheet: '%s'"),
git_path_opts_file()); git_path_opts_file());
return 0; return 0;
} }
@ -1097,7 +1097,7 @@ static int create_seq_dir(void)
return -1; return -1;
} }
else if (mkdir(git_path_seq_dir(), 0777) < 0) else if (mkdir(git_path_seq_dir(), 0777) < 0)
return error_errno(_("Could not create sequencer directory %s"), return error_errno(_("Could not create sequencer directory '%s'"),
git_path_seq_dir()); git_path_seq_dir());
return 0; return 0;
} }
@ -1116,12 +1116,12 @@ static int save_head(const char *head)
strbuf_addf(&buf, "%s\n", head); strbuf_addf(&buf, "%s\n", head);
if (write_in_full(fd, buf.buf, buf.len) < 0) { if (write_in_full(fd, buf.buf, buf.len) < 0) {
rollback_lock_file(&head_lock); rollback_lock_file(&head_lock);
return error_errno(_("Could not write to %s"), return error_errno(_("Could not write to '%s'"),
git_path_head_file()); git_path_head_file());
} }
if (commit_lock_file(&head_lock) < 0) { if (commit_lock_file(&head_lock) < 0) {
rollback_lock_file(&head_lock); rollback_lock_file(&head_lock);
return error(_("Error wrapping up %s."), git_path_head_file()); return error(_("Error wrapping up '%s'."), git_path_head_file());
} }
return 0; return 0;
} }
@ -1166,9 +1166,9 @@ int sequencer_rollback(struct replay_opts *opts)
return rollback_single_pick(); return rollback_single_pick();
} }
if (!f) if (!f)
return error_errno(_("cannot open %s"), git_path_head_file()); return error_errno(_("cannot open '%s'"), git_path_head_file());
if (strbuf_getline_lf(&buf, f)) { if (strbuf_getline_lf(&buf, f)) {
error(_("cannot read %s: %s"), git_path_head_file(), error(_("cannot read '%s': %s"), git_path_head_file(),
ferror(f) ? strerror(errno) : _("unexpected end of file")); ferror(f) ? strerror(errno) : _("unexpected end of file"));
fclose(f); fclose(f);
goto fail; goto fail;
@ -1207,7 +1207,7 @@ static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
todo_list->buf.len - offset) < 0) todo_list->buf.len - offset) < 0)
return error_errno(_("Could not write to '%s'"), todo_path); return error_errno(_("Could not write to '%s'"), todo_path);
if (commit_lock_file(&todo_lock) < 0) if (commit_lock_file(&todo_lock) < 0)
return error(_("Error wrapping up %s."), todo_path); return error(_("Error wrapping up '%s'."), todo_path);
return 0; return 0;
} }