Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-11-18 17:49:07 +0300
committerJunio C Hamano <gitster@pobox.com>2020-11-18 21:27:39 +0300
commitb6e2a4f07c238e179e4d358e84a7f9e3a5c07005 (patch)
tree89d837008cd5581dd284eddefae104918d3db662 /t/t2106-update-index-assume-unchanged.sh
parentbce46b1adc57945c26dea91829dfa7315f9292e7 (diff)
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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2106-update-index-assume-unchanged.sh')
-rwxr-xr-xt/t2106-update-index-assume-unchanged.sh3
1 files changed, 2 insertions, 1 deletions
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