Revision 2f3b28f27234a0130583131a6785c44e3dd1cac4 authored by Johannes Schindelin on 09 March 2023, 22:08:47 UTC, committed by Johannes Schindelin on 17 April 2023, 19:15:37 UTC
The `maint-2.30` branch accumulated quite a few fixes over the past two years. Most of those fixes were originally based on newer versions, and while the patches cherry-picked cleanly, we weren't diligent enough to pay attention to the CI builds and the GETTEXT_POISON job regressed. This topic branch fixes that. * js/gettext-poison-fixes t0033: GETTEXT_POISON fix t0003: GETTEXT_POISON fix, part 1 t0003: GETTEXT_POISON fix, conclusion t5619: GETTEXT_POISON fix t5604: GETTEXT_POISON fix, part 1 t5604: GETTEXT_POISON fix, conclusion
t2010-checkout-ambiguous.sh
#!/bin/sh
test_description='checkout and pathspecs/refspecs ambiguities'
. ./test-lib.sh
test_expect_success 'setup' '
echo hello >world &&
echo hello >all &&
git add all world &&
git commit -m initial &&
git branch world
'
test_expect_success 'reference must be a tree' '
test_must_fail git checkout $(git hash-object ./all) --
'
test_expect_success 'branch switching' '
test "refs/heads/master" = "$(git symbolic-ref HEAD)" &&
git checkout world -- &&
test "refs/heads/world" = "$(git symbolic-ref HEAD)"
'
test_expect_success 'checkout world from the index' '
echo bye > world &&
git checkout -- world &&
git diff --exit-code --quiet
'
test_expect_success 'non ambiguous call' '
git checkout all
'
test_expect_success 'allow the most common case' '
git checkout world &&
test "refs/heads/world" = "$(git symbolic-ref HEAD)"
'
test_expect_success 'check ambiguity' '
test_must_fail git checkout world all
'
test_expect_success 'check ambiguity in subdir' '
mkdir sub &&
# not ambiguous because sub/world does not exist
git -C sub checkout world ../all &&
echo hello >sub/world &&
# ambiguous because sub/world does exist
test_must_fail git -C sub checkout world ../all
'
test_expect_success 'disambiguate checking out from a tree-ish' '
echo bye > world &&
git checkout world -- world &&
git diff --exit-code --quiet
'
test_expect_success 'accurate error message with more than one ref' '
test_must_fail git checkout HEAD master -- 2>actual &&
test_i18ngrep 2 actual &&
test_i18ngrep "one reference expected, 2 given" actual
'
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...