mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +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>
51 lines
1.7 KiB
Bash
Executable file
51 lines
1.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='tests for git branch --track'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit one &&
|
|
test_commit two
|
|
'
|
|
|
|
test_expect_success 'checkout --track -b creates a new tracking branch' '
|
|
git checkout --track -b branch1 main &&
|
|
test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
|
|
test $(git config --get branch.branch1.remote) = . &&
|
|
test $(git config --get branch.branch1.merge) = refs/heads/main
|
|
'
|
|
|
|
test_expect_success 'checkout --track -b rejects an extra path argument' '
|
|
test_must_fail git checkout --track -b branch2 main one.t 2>err &&
|
|
test_grep "cannot be used with updating paths" err
|
|
'
|
|
|
|
test_expect_success 'checkout --track -b overrides autoSetupMerge=inherit' '
|
|
# Set up tracking config on main
|
|
test_config branch.main.remote origin &&
|
|
test_config branch.main.merge refs/heads/some-branch &&
|
|
test_config branch.autoSetupMerge inherit &&
|
|
# With --track=inherit, we copy the tracking config from main
|
|
git checkout --track=inherit -b b1 main &&
|
|
test_cmp_config origin branch.b1.remote &&
|
|
test_cmp_config refs/heads/some-branch branch.b1.merge &&
|
|
# With branch.autoSetupMerge=inherit, we do the same
|
|
git checkout -b b2 main &&
|
|
test_cmp_config origin branch.b2.remote &&
|
|
test_cmp_config refs/heads/some-branch branch.b2.merge &&
|
|
# But --track overrides this
|
|
git checkout --track -b b3 main &&
|
|
test_cmp_config . branch.b3.remote &&
|
|
test_cmp_config refs/heads/main branch.b3.merge &&
|
|
# And --track=direct does as well
|
|
git checkout --track=direct -b b4 main &&
|
|
test_cmp_config . branch.b4.remote &&
|
|
test_cmp_config refs/heads/main branch.b4.merge
|
|
'
|
|
|
|
test_done
|