Skip to content

Commit 747a306

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 d80691f commit 747a306

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
@@ -1120,6 +1120,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
11201120
unsigned flags = CREATE_UNICODE_ENVIRONMENT;
11211121
BOOL ret;
11221122
HANDLE cons;
1123+
const char *strace_env;
11231124

11241125
do_unset_environment_variables();
11251126

@@ -1177,6 +1178,31 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
11771178
free(quoted);
11781179
}
11791180

1181+
strace_env = getenv("GIT_STRACE_COMMANDS");
1182+
if (strace_env) {
1183+
char *p = path_lookup("strace.exe", 1);
1184+
if (!p)
1185+
return error("strace not found!");
1186+
if (xutftowcs_path(wcmd, p) < 0) {
1187+
free(p);
1188+
return -1;
1189+
}
1190+
free(p);
1191+
if (!strcmp("1", strace_env) ||
1192+
!strcasecmp("yes", strace_env) ||
1193+
!strcasecmp("true", strace_env))
1194+
strbuf_insert(&args, 0, "strace ", 7);
1195+
else {
1196+
const char *quoted = quote_arg(strace_env);
1197+
struct strbuf buf = STRBUF_INIT;
1198+
strbuf_addf(&buf, "strace -o %s ", quoted);
1199+
if (quoted != strace_env)
1200+
free((char *)quoted);
1201+
strbuf_insert(&args, 0, buf.buf, buf.len);
1202+
strbuf_release(&buf);
1203+
}
1204+
}
1205+
11801206
ALLOC_ARRAY(wargs, st_add(st_mult(2, args.len), 1));
11811207
xutftowcs(wargs, args.buf, 2 * args.len + 1);
11821208
strbuf_release(&args);

0 commit comments

Comments
 (0)