mirror of
https://github.com/git/git
synced 2024-06-30 22:54:27 +00:00
291ef5b61c
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>
59 lines
2.0 KiB
Bash
Executable File
59 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git command aliasing'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'nested aliases - internal execution' '
|
|
git config alias.nested-internal-1 nested-internal-2 &&
|
|
git config alias.nested-internal-2 status &&
|
|
git nested-internal-1 >output &&
|
|
test_grep "^On branch " output
|
|
'
|
|
|
|
test_expect_success 'nested aliases - mixed execution' '
|
|
git config alias.nested-external-1 nested-external-2 &&
|
|
git config alias.nested-external-2 "!git nested-external-3" &&
|
|
git config alias.nested-external-3 status &&
|
|
git nested-external-1 >output &&
|
|
test_grep "^On branch " output
|
|
'
|
|
|
|
test_expect_success 'looping aliases - internal execution' '
|
|
git config alias.loop-internal-1 loop-internal-2 &&
|
|
git config alias.loop-internal-2 loop-internal-3 &&
|
|
git config alias.loop-internal-3 loop-internal-2 &&
|
|
test_must_fail git loop-internal-1 2>output &&
|
|
test_grep "^fatal: alias loop detected: expansion of" output
|
|
'
|
|
|
|
# This test is disabled until external loops are fixed, because would block
|
|
# the test suite for a full minute.
|
|
#
|
|
#test_expect_failure 'looping aliases - mixed execution' '
|
|
# git config alias.loop-mixed-1 loop-mixed-2 &&
|
|
# git config alias.loop-mixed-2 "!git loop-mixed-1" &&
|
|
# test_must_fail git loop-mixed-1 2>output &&
|
|
# test_grep "^fatal: alias loop detected: expansion of" output
|
|
#'
|
|
|
|
test_expect_success 'run-command formats empty args properly' '
|
|
test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
|
|
sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
|
|
echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect &&
|
|
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
|
|
sed -n -e "s/^\(trace: start_command:\) .* -c /\1 SHELL -c /p" output >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|