From: brian m. carlson Date: Thu, 21 May 2020 02:07:12 GMT Subject: [PATCH v2 2/2] t2060: add a test for switch with --orphan and --discard-changes Message-ID: <20200521020712.1620993-3-sandals@crustytoothpaste.net> In-Reply-To: <20200521020712.1620993-1-sandals@crustytoothpaste.net> 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 --- t/t2060-switch.sh | 8 ++++++++ 1 file changed, 8 insertions(+) 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 &&