diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-23 17:40:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-23 18:27:52 (GMT) |
| commit | b60e88cc780ea54de65b62437afbeb9c857110f2 (patch) | |
| tree | 1431cacb282d7a24351a6e26735d84594cee4b43 /t | |
| parent | 8b0eaa41f2371cafd28324b00128405a80740b16 (diff) | |
| download | git-b60e88cc780ea54de65b62437afbeb9c857110f2.zip git-b60e88cc780ea54de65b62437afbeb9c857110f2.tar.gz git-b60e88cc780ea54de65b62437afbeb9c857110f2.tar.bz2 | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9902-completion.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 4c86ada..b7f5b1e 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -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" && |