X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=t%2Ft2060-switch.sh;h=2c1b8c0d6d22469fadd9eeb05a19c1b7a53d0f51;hb=a08a83db2bf27f015bec9a435f6d73e223c21c5e;hp=f9efa29dfb8c7ad762fc502d883db2aaa3f114a2;hpb=0c51181ffb178a6581ecb471091cbd2d0c48f165;p=thirdparty%2Fgit.git

diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
index f9efa29dfb..2c1b8c0d6d 100755
--- a/t/t2060-switch.sh
+++ b/t/t2060-switch.sh
@@ -68,6 +68,14 @@ test_expect_success 'new orphan branch from empty' '
 	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 &&