t9902: disable test on the list of merge-strategies under GETTEXT_POISON
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>
Junio C Hamano committed
Mar 23, 2018 at 10:40 UTC
b60e88cc780ea54de65b62437afbeb9c857110f2
1 file changed
+1
-1
t/t9902-completion.sh
+1
-1
@@ -1511,7 +1511,7 @@ test_expect_success 'sourcing the completion script clears cached porcelain comm
1511
verbose test -z "$__git_porcelain_commands"
1512
'
1513
1514
-test_expect_success 'sourcing the completion script clears cached merge strategies' '
1514
+test_expect_success !GETTEXT_POISON 'sourcing the completion script clears cached merge strategies' '
1515
__git_compute_merge_strategies &&
1516
verbose test -n "$__git_merge_strategies" &&
1517
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&