From: Junio C Hamano <gitster@pobox.com>
To: Ian Wienand <iwienand@redhat.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v5 3/3] run-command: show prepared command
Date: Fri, 24 May 2024 23:06:14 -0700 [thread overview]
Message-ID: <xmqqed9qifxl.fsf@gitster.g> (raw)
In-Reply-To: <20240525012207.1415196-3-iwienand@redhat.com> (Ian Wienand's message of "Sat, 25 May 2024 11:20:52 +1000")
Ian Wienand <iwienand@redhat.com> writes:
> +test_expect_success 'tracing a shell alias with arguments shows trace of prepared command' '
> + git config alias.echo "!echo \$*" &&
> + env GIT_TRACE=1 git echo argument 2>output &&
> + test_grep "^trace: start_command:.*" output
> +'
This will succeed even if you have two or more instances of this
log, which will not help you avoid the mistake we saw in an earlier
iteration.
How about making sure that the prepared command looks reasonable
enough and we have only one, by doing something like this?
test_expect_success 'tracing a shell alias with arg shows trace of prepared command' '
cat >expect <<-EOF &&
trace: prepare_cmd: 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
sed -n -e "s/^\(trace: prepare_cmd:\) .* -c /\1 SHELL -c /p" output >actual &&
test_cmp expect actual
'
A sample run of CI job with the above change (and others I sent on
the list) can be seen at:
https://github.com/git/git/actions/runs/9233329671
You can fetch 'seen' and can find commit 05ebf54569, which is the
tip of your topic including a few "fixup" commits I made on top.
$ git log --decorate --oneline master..05ebf54569
05ebf54569 (iw/trace-argv-on-alias) fixup! run-command: show prepared command
11056975bb fixup! run-command: show prepared command
770dda8f2b run-command: show prepared command
242b9d4d63 Documentation: alias: add notes on shell expansion
e4331ad0d4 Documentation: alias: rework notes into points
It hasn't finished running yet, but all the windows tests have
passed, so I'll happily go to bed now ;-)
Thanks.
next prev parent reply other threads:[~2024-05-25 6:06 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 [this message]
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
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=xmqqed9qifxl.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=iwienand@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).