mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
883b98efad
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>
110 lines
3 KiB
Bash
Executable file
110 lines
3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='switch basic functionality'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit first &&
|
|
git branch first-branch &&
|
|
test_commit second &&
|
|
test_commit third &&
|
|
git remote add origin nohost:/nopath &&
|
|
git update-ref refs/remotes/origin/foo first-branch
|
|
'
|
|
|
|
test_expect_success 'switch branch no arguments' '
|
|
test_must_fail git switch
|
|
'
|
|
|
|
test_expect_success 'switch branch' '
|
|
git switch first-branch &&
|
|
test_path_is_missing second.t
|
|
'
|
|
|
|
test_expect_success 'switch and detach' '
|
|
test_when_finished git switch main &&
|
|
test_must_fail git switch main^{commit} &&
|
|
git switch --detach main^{commit} &&
|
|
test_must_fail git symbolic-ref HEAD
|
|
'
|
|
|
|
test_expect_success 'switch and detach current branch' '
|
|
test_when_finished git switch main &&
|
|
git switch main &&
|
|
git switch --detach &&
|
|
test_must_fail git symbolic-ref HEAD
|
|
'
|
|
|
|
test_expect_success 'switch and create branch' '
|
|
test_when_finished git switch main &&
|
|
git switch -c temp main^ &&
|
|
test_cmp_rev main^ refs/heads/temp &&
|
|
echo refs/heads/temp >expected-branch &&
|
|
git symbolic-ref HEAD >actual-branch &&
|
|
test_cmp expected-branch actual-branch
|
|
'
|
|
|
|
test_expect_success 'force create branch from HEAD' '
|
|
test_when_finished git switch main &&
|
|
git switch --detach main &&
|
|
test_must_fail git switch -c temp &&
|
|
git switch -C temp &&
|
|
test_cmp_rev main refs/heads/temp &&
|
|
echo refs/heads/temp >expected-branch &&
|
|
git symbolic-ref HEAD >actual-branch &&
|
|
test_cmp expected-branch actual-branch
|
|
'
|
|
|
|
test_expect_success 'new orphan branch from empty' '
|
|
test_when_finished git switch main &&
|
|
test_must_fail git switch --orphan new-orphan HEAD &&
|
|
git switch --orphan new-orphan &&
|
|
test_commit orphan &&
|
|
git cat-file commit refs/heads/new-orphan >commit &&
|
|
! grep ^parent commit &&
|
|
git ls-files >tracked-files &&
|
|
echo orphan.t >expected &&
|
|
test_cmp expected tracked-files
|
|
'
|
|
|
|
test_expect_success 'orphan branch works with --discard-changes' '
|
|
test_when_finished git switch main &&
|
|
echo foo >foo.txt &&
|
|
git switch --discard-changes --orphan new-orphan2 &&
|
|
git ls-files >tracked-files &&
|
|
test_must_be_empty tracked-files
|
|
'
|
|
|
|
test_expect_success 'switching ignores file of same branch name' '
|
|
test_when_finished git switch main &&
|
|
: >first-branch &&
|
|
git switch first-branch &&
|
|
echo refs/heads/first-branch >expected &&
|
|
git symbolic-ref HEAD >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'guess and create branch' '
|
|
test_when_finished git switch main &&
|
|
test_must_fail git switch --no-guess foo &&
|
|
test_config checkout.guess false &&
|
|
test_must_fail git switch foo &&
|
|
test_config checkout.guess true &&
|
|
git switch foo &&
|
|
echo refs/heads/foo >expected &&
|
|
git symbolic-ref HEAD >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'not switching when something is in progress' '
|
|
test_when_finished rm -f .git/MERGE_HEAD &&
|
|
# fake a merge-in-progress
|
|
cp .git/HEAD .git/MERGE_HEAD &&
|
|
test_must_fail git switch -d @^
|
|
'
|
|
|
|
test_done
|