On Tue, Jan 12, 2021 at 08:47:32AM +0000, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin <johannes.schindelin@xxxxxx> > > The idea of the `GETTEXT_POISON` mode is to test translated messages, at > least _somewhat_. > > There is not really any point in turning off that mode by force, except > _maybe_ to test the mode itself. > > So let's avoid overriding `GIT_TEST_GETTEXT_POISON` in the test suite > unless testing the `GETTEXT_POISON` functionality itself. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> > --- > diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh > index a1c4f1f6d40..e5adee27d41 100755 > --- a/t/t9902-completion.sh > +++ b/t/t9902-completion.sh > @@ -2363,7 +2363,6 @@ test_expect_success 'sourcing the completion script clears cached commands' ' > ' > > test_expect_success 'sourcing the completion script clears cached merge strategies' ' > - GIT_TEST_GETTEXT_POISON=false && I think this change caused the failure in t9902 that you mentioned in the cover letter. If 'git merge' is invoked with a nonexisting merge strategy, then it errors out with an error message that contains a list of available merge strategies. The completion script relies on this behavior and "parses" this error message to get the available merge strategies, but it breaks when it can't find the expected text because it was poisoned. > __git_compute_merge_strategies && > verbose test -n "$__git_merge_strategies" && > . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && > -- > gitgitgadget >
