mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
8d3e33dadd
We have several code paths in the checkout code which are traversed only in this case, due to switch having different defaults from checkout. Let's add a test that the combination of options works and produces the expected behavior. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
104 lines
2.8 KiB
Bash
Executable file
104 lines
2.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='switch basic functionality'
|
|
|
|
. ./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 master &&
|
|
test_must_fail git switch master^{commit} &&
|
|
git switch --detach master^{commit} &&
|
|
test_must_fail git symbolic-ref HEAD
|
|
'
|
|
|
|
test_expect_success 'switch and detach current branch' '
|
|
test_when_finished git switch master &&
|
|
git switch master &&
|
|
git switch --detach &&
|
|
test_must_fail git symbolic-ref HEAD
|
|
'
|
|
|
|
test_expect_success 'switch and create branch' '
|
|
test_when_finished git switch master &&
|
|
git switch -c temp master^ &&
|
|
test_cmp_rev master^ 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 master &&
|
|
git switch --detach master &&
|
|
test_must_fail git switch -c temp &&
|
|
git switch -C temp &&
|
|
test_cmp_rev master 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 master &&
|
|
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 master &&
|
|
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 master &&
|
|
: >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 master &&
|
|
test_must_fail git switch --no-guess foo &&
|
|
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
|