@matheusbsbs / matheus-bagliano / commits / 291ef5b61c

run-command: show prepared command

This adds a trace point in start_command so we can see the full command invocation without having to resort to strace/code inspection. For example: $ GIT_TRACE=1 git test foo git.c:755 trace: exec: git-test foo run-command.c:657 trace: run_command: git-test foo run-command.c:657 trace: run_command: 'echo $*' foo run-command.c:749 trace: start_command: /bin/sh -c 'echo $* "$@"' 'echo $*' foo Prior changes have made the documentation around the internals of the alias command execution clearer, but I have still found this detailed view of the aliased command being run helpful for debugging purposes. A test case is added to ensure the full command output is present in the execution flow. Signed-off-by: Ian Wienand <iwienand@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ian Wienand committed May 27, 2024 at 10:30 UTC 291ef5b61c569ca9d40100fec6ab16dfd65c9a32

2 files changed +14

run-command.c

@@ -746,6 +746,8 @@ fail_pipe:

746 goto end_of_spawn;

747 }

748

749 + trace_argv_printf(&argv.v[1], "trace: start_command:");

750 +

751 if (pipe(notify_pipe))

752 notify_pipe[0] = notify_pipe[1] = -1;

753

@@ -913,6 +915,7 @@ end_of_spawn:

915 else if (cmd->use_shell)

916 cmd->args.v = prepare_shell_cmd(&nargv, sargv);

917

918 + trace_argv_printf(cmd->args.v, "trace: start_command:");

919 cmd->pid = mingw_spawnvpe(cmd->args.v[0], cmd->args.v,

920 (char**) cmd->env.v,

921 cmd->dir, fhin, fhout, fherr);

t/t0014-alias.sh

+11

@@ -44,4 +44,15 @@ test_expect_success 'run-command formats empty args properly' '

44 test_cmp expect actual

45 '

47 +test_expect_success 'tracing a shell alias with arguments shows trace of prepared command' '

48 + cat >expect <<-EOF &&

49 + trace: start_command: SHELL -c ${SQ}echo \$* "\$@"${SQ} ${SQ}echo \$*${SQ} arg

50 + EOF

51 + git config alias.echo "!echo \$*" &&

52 + env GIT_TRACE=1 git echo arg 2>output &&

53 + # redact platform differences

54 + sed -n -e "s/^$trace: start_command:$ .* -c /\1 SHELL -c /p" output >actual &&

55 + test_cmp expect actual

56 +'

57 +

58 test_done