From b6e2a4f07c238e179e4d358e84a7f9e3a5c07005 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 18 Nov 2020 14:49:07 +0000 Subject: [PATCH] t2106: ensure that the checkout fails for the expected reason During the transition of the test suite to a new default branch name, it was noticed that this test case succeeded for the wrong reason when the default branch name was overridden. While we fixed that in the previous commit, let's make sure that we look for a tell-tale in the error message that the `git checkout` failed for the reason we wanted it to fail. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- t/t2106-update-index-assume-unchanged.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh index 3396f23363..2d450daf5c 100755 --- a/t/t2106-update-index-assume-unchanged.sh +++ b/t/t2106-update-index-assume-unchanged.sh @@ -20,7 +20,8 @@ test_expect_success 'do not switch branches with dirty file' ' git checkout other && echo dirt >file && git update-index --assume-unchanged file && - test_must_fail git checkout - + test_must_fail git checkout - 2>err && + test_i18ngrep overwritten err ' test_done