Re: [PATCH 05/10] t5510: consolidate 'grep' and 'test_i18ngrep' patterns
- From
SZEDER Gábor <szeder.dev@gmail.com>
- Date
- Jan 26, 2018, 19:20 UTC
- Message-ID
- <CAM0VKjm0uveCRpNy8H+inwTKa6fzHAjGn=f9tmQ4p1MCWGuirQ@mail.gmail.com>
- In-Reply-To
- <xmqqa7x08p0e.fsf@gitster.mtv.corp.google.com>
On Fri, Jan 26, 2018 at 7:16 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 15 quoted lines
> SZEDER Gábor <szeder.dev@gmail.com> writes: > >> One of the tests in 't5510-fetch.sh' checks the output of 'git fetch' >> using 'test_i18ngrep', and while doing so it prefilters the output >> with 'grep' before piping the result into 'test_i18ngrep'. >> >> This prefiltering is unnecessary, with the appropriate pattern >> 'test_i18ngrep' can do it all by itself. Furthermore, piping data >> into 'test_i18ngrep' will interfere with the linting that will be >> added in a later patch. > > It is very likely that the prefiltering "grep" will not even see > what it is looking for under GETTEXT_POISON build in the first > place, so this conversion is the right thing to do from that point > of view as well.
No, GETTEXT_POISON only affects the translated messages, but those 'grep' invocations looked only at refnames and formatting.
This is the GETTEXT_POISON-ed output of 'git fetch' in that test (probably will get line-wrapped):
# GETTEXT POISON # * # GETTEXT POISON # descriptive-branch -> refs/crazyheads/descriptive-branch * # GETTEXT POISON # refs/others/crazy -> crazy * # GETTEXT POISON # descriptive-tag -> descriptive-tag
Show 25 quoted lines
>> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> >> --- >> t/t5510-fetch.sh | 9 +++------ >> 1 file changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh >> index 668c54be4..3debc87d4 100755 >> --- a/t/t5510-fetch.sh >> +++ b/t/t5510-fetch.sh >> @@ -222,12 +222,9 @@ test_expect_success 'fetch uses remote ref names to describe new refs' ' >> ( >> cd descriptive && >> git fetch o 2>actual && >> - grep " -> refs/crazyheads/descriptive-branch$" actual | >> - test_i18ngrep "new branch" && >> - grep " -> descriptive-tag$" actual | >> - test_i18ngrep "new tag" && >> - grep " -> crazy$" actual | >> - test_i18ngrep "new ref" >> + test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual && >> + test_i18ngrep "new tag.* -> descriptive-tag$" actual && >> + test_i18ngrep "new ref.* -> crazy$" actual >> ) && >> git checkout master >> '