Skip to content

Commit c0f80f1

Browse files
committed
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 b552ff8 commit c0f80f1

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
@@ -1403,6 +1403,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
14031403
HANDLE cons;
14041404
const char *(*quote_arg)(const char *arg) =
14051405
is_msys2_sh(*argv) ? quote_arg_msys2 : quote_arg_msvc;
1406+
const char *strace_env;
14061407

14071408
do_unset_environment_variables();
14081409

@@ -1461,6 +1462,31 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
14611462
free(quoted);
14621463
}
14631464

1465+
strace_env = getenv("GIT_STRACE_COMMANDS");
1466+
if (strace_env) {
1467+
char *p = path_lookup("strace.exe", 1);
1468+
if (!p)
1469+
return error("strace not found!");
1470+
if (xutftowcs_path(wcmd, p) < 0) {
1471+
free(p);
1472+
return -1;
1473+
}
1474+
free(p);
1475+
if (!strcmp("1", strace_env) ||
1476+
!strcasecmp("yes", strace_env) ||
1477+
!strcasecmp("true", strace_env))
1478+
strbuf_insert(&args, 0, "strace ", 7);
1479+
else {
1480+
const char *quoted = quote_arg(strace_env);
1481+
struct strbuf buf = STRBUF_INIT;
1482+
strbuf_addf(&buf, "strace -o %s ", quoted);
1483+
if (quoted != strace_env)
1484+
free((char *)quoted);
1485+
strbuf_insert(&args, 0, buf.buf, buf.len);
1486+
strbuf_release(&buf);
1487+
}
1488+
}
1489+
14641490
ALLOC_ARRAY(wargs, st_add(st_mult(2, args.len), 1));
14651491
xutftowcs(wargs, args.buf, 2 * args.len + 1);
14661492
strbuf_release(&args);

0 commit comments

Comments
 (0)