mirror of
https://github.com/git/git
synced 2024-07-07 19:39:27 +00:00
80d32e84b5
The tests listed below, since previous commits, no longer trigger any leak. + t1507-rev-parse-upstream.sh + t1508-at-combinations.sh + t1514-rev-parse-push.sh + t2027-checkout-track.sh + t3200-branch.sh + t3204-branch-name-interpretation.sh + t5404-tracking-branches.sh + t5517-push-mirror.sh + t5525-fetch-tagopt.sh + t6040-tracking-info.sh + t7508-status.sh Let's mark them with "TEST_PASSES_SANITIZE_LEAK=true" to notice and fix promptly any new leak that may be introduced and triggered by them in the future. Signed-off-by: Rubén Justo <rjusto@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
52 lines
1.7 KiB
Bash
Executable File
52 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_i18ngrep "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
|