mirror of
https://github.com/git/git.git
synced 2026-06-30 19:58:12 +00:00
12fee11f21
When "git checkout <dwim>" and "git switch <dwim>" need to error out due to ambiguity of the branch name <dwim>, these two commands give an advise message with a sample command that tells the user how to disambiguate from the parse_remote_branch() function. The sample command hardcodes "git checkout", since this feature predates "git switch" by a large margin. To a user who said "git switch <dwim>" and got this message, it is confusing. Pass the "enum checkout_command", which was invented in the previous step for this exact purpose, down the call chain leading to parse_remote_branch() function to change the sample command shown to the user in this advise message. Also add a bit more test coverage for this "fail to DWIM under ambiguity" that we lack, as well as the message we produce when we fail. Reported-by: Simon Cheng <cyqsimon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
69 lines
2.2 KiB
Bash
Executable File
69 lines
2.2 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-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_expect_success 'ambiguous tracking info' '
|
|
# Set up a few remote repositories
|
|
git init --bare --initial-branch=trunk src1 &&
|
|
git init --bare --initial-branch=trunk src2 &&
|
|
git push src1 one:refs/heads/trunk &&
|
|
git push src2 two:refs/heads/trunk &&
|
|
|
|
git remote add -f src1 "file://$PWD/src1" &&
|
|
git remote add -f src2 "file://$PWD/src2" &&
|
|
|
|
# DWIM
|
|
test_must_fail git checkout trunk 2>hint.checkout &&
|
|
test_grep "hint: *git checkout --track" hint.checkout &&
|
|
|
|
test_must_fail git switch trunk 2>hint.switch &&
|
|
test_grep "hint: *git switch --track" hint.switch
|
|
'
|
|
|
|
test_done
|