mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![Johannes Schindelin](/assets/img/avatar_default.png)
Carefully excluding t2106, which sees independent development elsewhere at the time of writing, we transition above-mentioned tests to the default branch name `main`. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t2*.sh && git checkout HEAD -- t2106\*) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
28 lines
738 B
Bash
Executable file
28 lines
738 B
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_i18ngrep "cannot be used with updating paths" err
|
|
'
|
|
|
|
test_done
|