mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
6789275d37
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
48 lines
1.6 KiB
Bash
Executable file
48 lines
1.6 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_done
|