mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert: quote filter names in error messages

Browse Source 
Git filter driver commands with spaces (e.g. `filter.sh foo`) are hard
to read in error messages. Quote them to improve the readability.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lars Schneider
2016-10-16 16:20:25 -07:00
committed by Junio C Hamano
parent 35f6318d44
commit 255f04d604
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
convert.c
View File

@ -412,7 +412,7 @@ static int filter_buffer_or_fd(int in, int out, void *data)
child_process.out = out; child_process.out = out;
if (start_command(&child_process)) if (start_command(&child_process))
return error("cannot fork to run external filter %s", params->cmd); return error("cannot fork to run external filter '%s'", params->cmd);
sigchain_push(SIGPIPE, SIG_IGN); sigchain_push(SIGPIPE, SIG_IGN);
@ -430,13 +430,13 @@ static int filter_buffer_or_fd(int in, int out, void *data)
if (close(child_process.in)) if (close(child_process.in))
write_err = 1; write_err = 1;
if (write_err) if (write_err)
error("cannot feed the input to external filter %s", params->cmd); error("cannot feed the input to external filter '%s'", params->cmd);
sigchain_pop(SIGPIPE); sigchain_pop(SIGPIPE);
status = finish_command(&child_process); status = finish_command(&child_process);
if (status) if (status)
error("external filter %s failed %d", params->cmd, status); error("external filter '%s' failed %d", params->cmd, status);
strbuf_release(&cmd); strbuf_release(&cmd);
return (write_err || status); return (write_err || status);
@ -477,15 +477,15 @@ static int apply_filter(const char *path, const char *src, size_t len, int fd,
return 0; /* error was already reported */ return 0; /* error was already reported */
if (strbuf_read(&nbuf, async.out, len) < 0) { if (strbuf_read(&nbuf, async.out, len) < 0) {
error("read from external filter %s failed", cmd); error("read from external filter '%s' failed", cmd);
ret = 0; ret = 0;
} }
if (close(async.out)) { if (close(async.out)) {
error("read from external filter %s failed", cmd); error("read from external filter '%s' failed", cmd);
ret = 0; ret = 0;
} }
if (finish_async(&async)) { if (finish_async(&async)) {
error("external filter %s failed", cmd); error("external filter '%s' failed", cmd);
ret = 0; ret = 0;
} }