development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

t9902: disable test on the list of merge-strategies under GETTEXT_POISON

Browse source 
The code to learn the list of merge strategies from the output of
"git merge -s help" forces C locale, so that it can notice the
message shown to indicate where the list starts in the output.

However, GETTEXT_POISON build corrupts its output even when run in
the C locale, and we cannot expect this test to succeed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2018-03-23 10:40:06 -07:00
parent 8b0eaa41f2
commit b60e88cc78
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t9902-completion.sh
View file

@ -1511,7 +1511,7 @@ test_expect_success 'sourcing the completion script clears cached porcelain comm
verbose test -z "$__git_porcelain_commands"
'
test_expect_success 'sourcing the completion script clears cached merge strategies' '
test_expect_success !GETTEXT_POISON 'sourcing the completion script clears cached merge strategies' '
__git_compute_merge_strategies &&
verbose test -n "$__git_merge_strategies" &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&