mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t2060: add a test for switch with --orphan and --discard-changes

Browse Source 
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>
This commit is contained in:
brian m. carlson
2020-05-21 02:07:12 +00:00
committed by Junio C Hamano
parent 81861288a9
commit 8d3e33dadd
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t2060-switch.sh
View File

@ -68,6 +68,14 @@ test_expect_success 'new orphan branch from empty' '
test_cmp expected tracked-files 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_expect_success 'switching ignores file of same branch name' '
test_when_finished git switch master && test_when_finished git switch master &&
: >first-branch && : >first-branch &&