mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
tests: remove most uses of C_LOCALE_OUTPUT
As a follow-up to d162b25f95 (tests: remove support for
GIT_TEST_GETTEXT_POISON, 2021-01-20) remove those uses of the now
always true C_LOCALE_OUTPUT prerequisite from those tests which
declare it as an argument to test_expect_{success,failure}.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
Junio C Hamano
parent
780aa0a21e
commit
a926c4b904
|
|
@ -271,7 +271,7 @@ test_expect_success 'pretend we have a mix of all possible results' '
|
|||
EOF
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
|
||||
test_expect_success 'test --verbose' '
|
||||
run_sub_test_lib_test_err \
|
||||
t1234-verbose "test verbose" --verbose <<-\EOF &&
|
||||
test_expect_success "passing test" true
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set' '
|
|||
test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
|
||||
test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
|
||||
echo fallthrough >expect &&
|
||||
echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&
|
||||
test_cmp expect actual
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ test_expect_success 'push cannot create a badly named ref' '
|
|||
! grep -e "broken\.\.\.ref" output
|
||||
'
|
||||
|
||||
test_expect_failure C_LOCALE_OUTPUT 'push --mirror can delete badly named ref' '
|
||||
test_expect_failure 'push --mirror can delete badly named ref' '
|
||||
top=$(pwd) &&
|
||||
git init src &&
|
||||
git init dest &&
|
||||
|
|
|
|||
|
|
@ -314,39 +314,39 @@ test_expect_success 'ambiguous short sha1 ref' '
|
|||
grep "refname.*${REF}.*ambiguous" err
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (raw)' '
|
||||
test_expect_success 'ambiguity errors are not repeated (raw)' '
|
||||
test_must_fail git rev-parse 00000 2>stderr &&
|
||||
grep "is ambiguous" stderr >errors &&
|
||||
test_line_count = 1 errors
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (treeish)' '
|
||||
test_expect_success 'ambiguity errors are not repeated (treeish)' '
|
||||
test_must_fail git rev-parse 00000:foo 2>stderr &&
|
||||
grep "is ambiguous" stderr >errors &&
|
||||
test_line_count = 1 errors
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (peel)' '
|
||||
test_expect_success 'ambiguity errors are not repeated (peel)' '
|
||||
test_must_fail git rev-parse 00000^{commit} 2>stderr &&
|
||||
grep "is ambiguous" stderr >errors &&
|
||||
test_line_count = 1 errors
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' '
|
||||
test_expect_success 'ambiguity hints' '
|
||||
test_must_fail git rev-parse 000000000 2>stderr &&
|
||||
grep ^hint: stderr >hints &&
|
||||
# 16 candidates, plus one intro line
|
||||
test_line_count = 17 hints
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' '
|
||||
test_expect_success 'ambiguity hints respect type' '
|
||||
test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
|
||||
grep ^hint: stderr >hints &&
|
||||
# 5 commits, 1 tag (which is a committish), plus intro line
|
||||
test_line_count = 7 hints
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'failed type-selector still shows hint' '
|
||||
test_expect_success 'failed type-selector still shows hint' '
|
||||
# these two blobs share the same prefix "ee3d", but neither
|
||||
# will pass for a commit
|
||||
echo 851 | git hash-object --stdin -w &&
|
||||
|
|
@ -370,7 +370,7 @@ test_expect_success 'core.disambiguate does not override context' '
|
|||
git -c core.disambiguate=committish rev-parse $sha1^{tree}
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'ambiguous commits are printed by type first, then hash order' '
|
||||
test_expect_success 'ambiguous commits are printed by type first, then hash order' '
|
||||
test_must_fail git rev-parse 0000 2>stderr &&
|
||||
grep ^hint: stderr >hints &&
|
||||
grep 0000 hints >objects &&
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ test_expect_success 'verbose flag is heeded, even after --continue' '
|
|||
grep "^ file1 | 2 +-$" output
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
|
||||
test_expect_success 'multi-squash only fires up editor once' '
|
||||
base=$(git rev-parse HEAD~4) &&
|
||||
(
|
||||
set_fake_editor &&
|
||||
|
|
@ -463,7 +463,7 @@ test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
|
|||
test 1 = $(git show | grep ONCE | wc -l)
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '
|
||||
test_expect_success 'multi-fixup does not fire up editor' '
|
||||
git checkout -b multi-fixup E &&
|
||||
base=$(git rev-parse HEAD~4) &&
|
||||
(
|
||||
|
|
@ -514,7 +514,7 @@ test_expect_success 'commit message retained after conflict' '
|
|||
git branch -D conflict-squash
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messages' '
|
||||
test_expect_success 'squash and fixup generate correct log messages' '
|
||||
cat >expect-squash-fixup <<-\EOF &&
|
||||
B
|
||||
|
||||
|
|
@ -541,7 +541,7 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa
|
|||
git branch -D squash-fixup
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
|
||||
test_expect_success 'squash ignores comments' '
|
||||
git checkout -b skip-comments E &&
|
||||
base=$(git rev-parse HEAD~4) &&
|
||||
(
|
||||
|
|
@ -557,7 +557,7 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
|
|||
git branch -D skip-comments
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '
|
||||
test_expect_success 'squash ignores blank lines' '
|
||||
git checkout -b skip-blank-lines E &&
|
||||
base=$(git rev-parse HEAD~4) &&
|
||||
(
|
||||
|
|
@ -995,7 +995,7 @@ test_expect_success 'rebase -ix with several instances of --exec' '
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' '
|
||||
test_expect_success 'rebase -ix with --autosquash' '
|
||||
git reset --hard execute &&
|
||||
git checkout -b autosquash &&
|
||||
echo second >second.txt &&
|
||||
|
|
@ -1136,7 +1136,7 @@ test_expect_success 'rebase -i --root reword root when root has untracked file c
|
|||
test "$(git rev-list --count HEAD)" = 2
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '
|
||||
test_expect_success 'rebase --edit-todo does not work on non-interactive rebase' '
|
||||
git checkout reword-original-root-branch &&
|
||||
git reset --hard &&
|
||||
git checkout conflict-branch &&
|
||||
|
|
|
|||
|
|
@ -306,23 +306,23 @@ test_auto_fixup_fixup () {
|
|||
fi
|
||||
}
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'fixup! fixup!' '
|
||||
test_expect_success 'fixup! fixup!' '
|
||||
test_auto_fixup_fixup fixup fixup
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'fixup! squash!' '
|
||||
test_expect_success 'fixup! squash!' '
|
||||
test_auto_fixup_fixup fixup squash
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'squash! squash!' '
|
||||
test_expect_success 'squash! squash!' '
|
||||
test_auto_fixup_fixup squash squash
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'squash! fixup!' '
|
||||
test_expect_success 'squash! fixup!' '
|
||||
test_auto_fixup_fixup squash fixup
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' '
|
||||
test_expect_success 'autosquash with custom inst format' '
|
||||
git reset --hard base &&
|
||||
git config --add rebase.instructionFormat "[%an @ %ar] %s" &&
|
||||
echo 2 >file1 &&
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ test_expect_success 'setup expected' '
|
|||
'
|
||||
|
||||
# Test splitting the first patch, then adding both
|
||||
test_expect_success C_LOCALE_OUTPUT 'add first line works' '
|
||||
test_expect_success 'add first line works' '
|
||||
git commit -am "clear local changes" &&
|
||||
git apply patch &&
|
||||
printf "%s\n" s y y | git add -p file 2>error |
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ test_expect_success 'apply --numstat understands diff --binary format' '
|
|||
|
||||
# apply needs to be able to skip the binary material correctly
|
||||
# in order to report the line number of a corrupt patch.
|
||||
test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
|
||||
test_expect_success 'apply detecting corrupt patch correctly' '
|
||||
git diff >output &&
|
||||
sed -e "s/-CIT/xCIT/" <output >broken &&
|
||||
test_must_fail git apply --stat --summary broken 2>detected &&
|
||||
|
|
@ -73,7 +73,7 @@ test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
|
|||
test "$detected" = xCIT
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
|
||||
test_expect_success 'apply detecting corrupt patch correctly' '
|
||||
git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
|
||||
test_must_fail git apply --stat --summary broken 2>detected &&
|
||||
detected=$(cat detected) &&
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ test_expect_success 'NUL separation with --stat' '
|
|||
test_i18ncmp expected actual
|
||||
'
|
||||
|
||||
test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' '
|
||||
test_expect_failure 'NUL termination with --stat' '
|
||||
stat0_part=$(git diff --stat HEAD^ HEAD) &&
|
||||
stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
|
||||
printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ test_expect_success 'index-pack --strict <pack> works in non-repo' '
|
|||
test_path_is_file foo.idx
|
||||
'
|
||||
|
||||
test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
|
||||
test_expect_success !PTHREADS 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
|
||||
test_must_fail git index-pack --threads=2 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_line_count = 1 warnings &&
|
||||
|
|
@ -445,7 +445,7 @@ test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.th
|
|||
grep -F "no threads support, ignoring pack.threads" err
|
||||
'
|
||||
|
||||
test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
|
||||
test_expect_success !PTHREADS 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
|
||||
git pack-objects --threads=2 --stdout --all </dev/null >/dev/null 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_line_count = 1 warnings &&
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ test_expect_success 'add remote whose URL agrees with url.<...>.insteadOf' '
|
|||
git remote add myremote git@host.com:team/repo.git
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
|
||||
test_expect_success 'remote information for the origin' '
|
||||
(
|
||||
cd test &&
|
||||
tokens_match origin "$(git remote)" &&
|
||||
|
|
@ -81,7 +81,7 @@ test_expect_success 'add another remote' '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
|
||||
test_expect_success 'check remote-tracking' '
|
||||
(
|
||||
cd test &&
|
||||
check_remote_track origin main side &&
|
||||
|
|
@ -107,7 +107,7 @@ test_expect_success 'remove remote' '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'remove remote' '
|
||||
test_expect_success 'remove remote' '
|
||||
(
|
||||
cd test &&
|
||||
tokens_match origin "$(git remote)" &&
|
||||
|
|
|
|||
|
|
@ -1097,7 +1097,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
|
||||
test_expect_success 'fetch aligned output' '
|
||||
git clone . full-output &&
|
||||
test_commit looooooooooooong-tag &&
|
||||
(
|
||||
|
|
@ -1112,7 +1112,7 @@ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
|
||||
test_expect_success 'fetch compact output' '
|
||||
git clone . compact &&
|
||||
test_commit extraaa &&
|
||||
(
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ test_expect_success 'clone with excess parameters (2)' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'output from clone' '
|
||||
test_expect_success 'output from clone' '
|
||||
rm -fr dst &&
|
||||
git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
|
||||
test $(grep Clon output | wc -l) = 1
|
||||
|
|
|
|||
|
|
@ -2905,7 +2905,7 @@ test_setup_9e () {
|
|||
)
|
||||
}
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT '9e: N-to-1 whammo' '
|
||||
test_expect_success '9e: N-to-1 whammo' '
|
||||
test_setup_9e &&
|
||||
(
|
||||
cd 9e &&
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ test_expect_success 'git clean with prefix' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '
|
||||
test_expect_success 'git clean with relative prefix' '
|
||||
|
||||
mkdir -p build docs &&
|
||||
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
|
||||
|
|
@ -123,7 +123,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '
|
|||
verbose test "$would_clean" = ../src/part3.c
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' '
|
||||
test_expect_success 'git clean with absolute path' '
|
||||
|
||||
mkdir -p build docs &&
|
||||
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
|
||||
|
|
@ -407,7 +407,7 @@ test_expect_success 'clean.requireForce and -f' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'core.excludesfile' '
|
||||
test_expect_success 'core.excludesfile' '
|
||||
|
||||
echo excludes >excludes &&
|
||||
echo included >included &&
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ test_expect_success 'with hook and editor (merge)' '
|
|||
test_rebase () {
|
||||
expect=$1 &&
|
||||
mode=$2 &&
|
||||
test_expect_$expect C_LOCALE_OUTPUT "with hook (rebase ${mode:--i})" '
|
||||
test_expect_$expect "with hook (rebase ${mode:--i})" '
|
||||
test_when_finished "\
|
||||
git rebase --abort
|
||||
git checkout -f main
|
||||
|
|
@ -307,7 +307,7 @@ test_expect_success 'with failing hook (merge)' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'with failing hook (cherry-pick)' '
|
||||
test_expect_success 'with failing hook (cherry-pick)' '
|
||||
test_when_finished "git checkout -f main" &&
|
||||
git checkout -B other b &&
|
||||
test_must_fail git cherry-pick rebase-1 2>actual &&
|
||||
|
|
|
|||
|
|
@ -969,7 +969,7 @@ do
|
|||
"
|
||||
done
|
||||
|
||||
test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'grep --threads=N or pack.threads=N warns when no pthreads' '
|
||||
test_expect_success !PTHREADS 'grep --threads=N or pack.threads=N warns when no pthreads' '
|
||||
git grep --threads=2 Hello hello_world 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_line_count = 1 warnings &&
|
||||
|
|
|
|||
Loading…
Reference in a new issue