Skip to content

Commit 4661879

Browse files
dschoGit for Windows Build Agent
authored andcommitted
Help debugging with MSys2 by optionally executing bash with strace
MSys2's strace facility is very useful for debugging... With this patch, the bash will be executed through strace if the environment variable GIT_STRACE_COMMANDS is set, which comes in real handy when investigating issues in the test suite. Also support passing a path to a log file via GIT_STRACE_COMMANDS to force Git to call strace.exe with the `-o <path>` argument, i.e. to log into a file rather than print the log directly. That comes in handy when the output would otherwise misinterpreted by a calling process as part of Git's output. Note: the values "1", "yes" or "true" are *not* specifying paths, but tell Git to let strace.exe log directly to the console. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 87370ea commit 4661879

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

compat/mingw.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,6 +1466,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
14661466
const char *(*quote_arg)(const char *arg) =
14671467
is_msys2_sh(cmd ? cmd : *argv) ?
14681468
quote_arg_msys2 : quote_arg_msvc;
1469+
const char *strace_env;
14691470

14701471
/* Make sure to override previous errors, if any */
14711472
errno = 0;
@@ -1549,6 +1550,31 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
15491550
free(quoted);
15501551
}
15511552

1553+
strace_env = getenv("GIT_STRACE_COMMANDS");
1554+
if (strace_env) {
1555+
char *p = path_lookup("strace.exe", 1);
1556+
if (!p)
1557+
return error("strace not found!");
1558+
if (xutftowcs_path(wcmd, p) < 0) {
1559+
free(p);
1560+
return -1;
1561+
}
1562+
free(p);
1563+
if (!strcmp("1", strace_env) ||
1564+
!strcasecmp("yes", strace_env) ||
1565+
!strcasecmp("true", strace_env))
1566+
strbuf_insert(&args, 0, "strace ", 7);
1567+
else {
1568+
const char *quoted = quote_arg(strace_env);
1569+
struct strbuf buf = STRBUF_INIT;
1570+
strbuf_addf(&buf, "strace -o %s ", quoted);
1571+
if (quoted != strace_env)
1572+
free((char *)quoted);
1573+
strbuf_insert(&args, 0, buf.buf, buf.len);
1574+
strbuf_release(&buf);
1575+
}
1576+
}
1577+
15521578
ALLOC_ARRAY(wargs, st_add(st_mult(2, args.len), 1));
15531579
xutftowcs(wargs, args.buf, 2 * args.len + 1);
15541580
strbuf_release(&args);

0 commit comments

Comments
 (0)