path: root/trace.c
diff options
authorJeff King <>2018-01-15 10:59:44 (GMT)
committerJunio C Hamano <>2018-01-16 20:16:54 (GMT)
commit1fbdab21bb452ca4732bf088539247047465b99d (patch)
tree1b9f8229b5588ed959ebf0c7738856ebe3f3238f /trace.c
parente35f11c29391e557964a39204fae6b89afab6a2a (diff)
trace: avoid unnecessary quoting
Trace output which contains arbitrary strings (e.g., the arguments to commands which we are running) is always passed through sq_quote_buf(). That function always adds single-quotes, even if the output consists of vanilla characters. This can make the output a bit hard to read. Let's avoid the quoting if there are no characters which a shell would interpret. Trace output doesn't necessarily need to be shell-compatible, but: - the shell language is a good ballpark for what humans consider readable (well, humans versed in command line tools) - the run_command bits can be cut-and-pasted to a shell, and we'll keep that property - it covers any cases which would make the output visually ambiguous (e.g., embedded whitespace or quotes) Signed-off-by: Jeff King <> Signed-off-by: Nguyễn Thái Ngọc Duy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'trace.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/trace.c b/trace.c
index fa9174f..9784915 100644
--- a/trace.c
+++ b/trace.c
@@ -157,7 +157,7 @@ static void trace_argv_vprintf_fl(const char *file, int line,
strbuf_vaddf(&buf, format, ap);
- sq_quote_argv(&buf, argv);
+ sq_quote_argv_pretty(&buf, argv);
print_trace_line(&trace_default_key, &buf);
@@ -426,6 +426,6 @@ void trace_command_performance(const char **argv)
- sq_quote_argv(&command_line, argv);
+ sq_quote_argv_pretty(&command_line, argv);
command_start_time = getnanotime();