From: Junio C Hamano <gitster@pobox•com>
To: Ian Wienand <iwienand@redhat•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v6 3/3] run-command: show prepared command
Date: Sun, 26 May 2024 09:20:46 -0700 [thread overview]
Message-ID: <xmqqh6ekh7dt.fsf@gitster.g> (raw)
In-Reply-To: <20240525234454.1489598-3-iwienand@redhat.com> (Ian Wienand's message of "Sun, 26 May 2024 09:44:35 +1000")
Ian Wienand <iwienand@redhat•com> writes:
> 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. This simply looks for the trace point output;
> the details change depending on platform -- the important thing is
> that we have a verbose log point, not so much the details of what
> happens on each platform.
>
> Signed-off-by: Ian Wienand <iwienand@redhat•com>
> ---
> run-command.c | 3 +++
> t/t0014-alias.sh | 12 ++++++++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/run-command.c b/run-command.c
> index 1b821042b4..31b20123d8 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -746,6 +746,8 @@ int start_command(struct child_process *cmd)
> goto end_of_spawn;
> }
>
> + trace_argv_printf(&argv.v[1], "trace: start_command:");
> +
> if (pipe(notify_pipe))
> notify_pipe[0] = notify_pipe[1] = -1;
>
> @@ -913,6 +915,7 @@ int start_command(struct child_process *cmd)
> else if (cmd->use_shell)
> cmd->args.v = prepare_shell_cmd(&nargv, sargv);
>
> + trace_argv_printf(cmd->args.v, "trace: start_command:");
> cmd->pid = mingw_spawnvpe(cmd->args.v[0], cmd->args.v,
> (char**) cmd->env.v,
> cmd->dir, fhin, fhout, fherr);
> diff --git a/t/t0014-alias.sh b/t/t0014-alias.sh
> index 95568342be..634f6d78ef 100755
> --- a/t/t0014-alias.sh
> +++ b/t/t0014-alias.sh
> @@ -44,4 +44,16 @@ test_expect_success 'run-command formats empty args properly' '
> test_cmp expect actual
> '
>
> +test_expect_success 'tracing a shell alias with arguments shows trace of prepared command' '
> + cat >expect <<-EOF &&
> + trace: start_command: SHELL -c ${SQ}echo \$* "\$@"${SQ} ${SQ}echo \$*${SQ} arg
> + EOF
> + git config alias.echo "!echo \$*" &&
> + env GIT_TRACE=1 git echo arg 2>output &&
> + # redact platform differences
> + cat output &&
That "cat" is not about "redact"ing platform differences. Leftover
debugging? I'll remove it while queuing.
> + sed -n -e "s/^\(trace: start_command:\) .* -c /\1 SHELL -c /p" output >actual &&
> + test_cmp expect actual
> +'
Other than that, this step looks good to me.
Thanks.
next prev parent reply other threads:[~2024-05-26 16:20 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 2:41 [PATCH] alias: document caveats and add trace of prepared command Ian Wienand
2024-05-22 3:29 ` Eric Sunshine
2024-05-22 16:07 ` Junio C Hamano
2024-05-23 0:38 ` Ian Wienand
2024-05-23 4:20 ` [PATCH v2 1/3] Documentation: alias: rework notes into points Ian Wienand
2024-05-23 4:20 ` [PATCH v2 2/3] Documentation: alias: add notes on shell expansion Ian Wienand
2024-05-23 4:20 ` [PATCH v2 3/3] run-command: show prepared command Ian Wienand
2024-05-23 4:27 ` [PATCH v2 1/3] Documentation: alias: rework notes into points Eric Sunshine
2024-05-23 4:39 ` Ian Wienand
2024-05-23 4:37 ` [PATCH v3 " Ian Wienand
2024-05-23 4:37 ` [PATCH v3 2/3] Documentation: alias: add notes on shell expansion Ian Wienand
2024-05-23 4:37 ` [PATCH v3 3/3] run-command: show prepared command Ian Wienand
2024-05-23 15:29 ` Junio C Hamano
2024-05-23 23:40 ` Junio C Hamano
2024-05-24 6:09 ` Junio C Hamano
2024-05-24 7:18 ` Ian Wienand
2024-05-24 15:33 ` Junio C Hamano
2024-05-24 0:43 ` Ian Wienand
2024-05-24 17:50 ` Junio C Hamano
2024-05-25 1:13 ` Ian Wienand
2024-05-23 15:14 ` [PATCH v3 1/3] Documentation: alias: rework notes into points Junio C Hamano
2024-05-24 7:32 ` [PATCH v4 " Ian Wienand
2024-05-24 7:32 ` [PATCH v4 2/3] Documentation: alias: add notes on shell expansion Ian Wienand
2024-05-24 7:32 ` [PATCH v4 3/3] run-command: show prepared command Ian Wienand
2024-05-24 19:16 ` Junio C Hamano
2024-05-24 19:58 ` Junio C Hamano
2024-05-25 1:14 ` Ian Wienand
2024-05-25 1:20 ` [PATCH v5 1/3] Documentation: alias: rework notes into points Ian Wienand
2024-05-25 1:20 ` [PATCH v5 2/3] Documentation: alias: add notes on shell expansion Ian Wienand
2024-05-25 1:20 ` [PATCH v5 3/3] run-command: show prepared command Ian Wienand
2024-05-25 5:44 ` Junio C Hamano
2024-05-25 6:06 ` Junio C Hamano
2024-05-25 23:49 ` Ian Wienand
2024-05-25 23:44 ` [PATCH v6 1/3] Documentation: alias: rework notes into points Ian Wienand
2024-05-25 23:44 ` [PATCH v6 2/3] Documentation: alias: add notes on shell expansion Ian Wienand
2024-05-26 23:26 ` Junio C Hamano
2024-05-27 0:22 ` Ian Wienand
2024-05-25 23:44 ` [PATCH v6 3/3] run-command: show prepared command Ian Wienand
2024-05-26 16:20 ` Junio C Hamano [this message]
2024-05-27 0:30 ` [PATCH v7 1/3] Documentation: alias: rework notes into points Ian Wienand
2024-05-27 0:30 ` [PATCH v7 2/3] Documentation: alias: add notes on shell expansion Ian Wienand
2024-05-27 17:48 ` Junio C Hamano
2024-05-27 0:30 ` [PATCH v7 3/3] run-command: show prepared command Ian Wienand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh6ekh7dt.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=iwienand@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox