On Thu, Mar 22, 2018 at 3:16 PM, SZEDER Gábor <szeder....@gmail.com> wrote:
> Add tests to ensure that these variables are indeed cleared when the
> completion script is sourced; not just the variables caching options,
> but all other caching variables, i.e. the variables caching commands,
> porcelain commands and merge strategies as well.
> +test_expect_success '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" &&
> + verbose test -z "$__git_merge_strategies"
> +'
Hang on, this test fails in the GETTEXT_POISON build.
The thing is, we get the merge strategies with this piece of code in
__git_list_merge_strategies() in master:
LANG=C LC_ALL=C git merge -s help 2>&1 |
sed -n -e '/[Aa]vailable strategies are: /,/^$/{
# a couple of s/// commands
}'
and that '/[Aa]vailable strategies are: /' won't match in a
GETTEXT_POISON-ed output, because that string is translated.
I think for now (-rc phase) we should just drop this test, and in the
future we should consider adding a 'git merge --list-strategies' option.
