On Sun, Feb 21, 2016 at 12:32 PM, John Keeping <john@xxxxxxxxxxxxx> wrote:
> GNU grep 2.23 detects the input used in this test as binary data so it
> does not work for extracting lines from a file. We could add the "-a"
> option to force grep to treat the input as text, but not all
> implementations support that. Instead, use sed to extract the desired
> lines since it will always treat its input as text.
>
> While touching these lines, modernize the test style to avoid hiding the
> exit status of "git blame" and remove a space following a redirection
> operator.
>
> Signed-off-by: John Keeping <john@xxxxxxxxxxxxx>
> ---
> diff --git a/t/t8005-blame-i18n.sh b/t/t8005-blame-i18n.sh
> @@ -35,8 +35,8 @@ EOF
> test_expect_success !MINGW \
> 'blame respects i18n.commitencoding' '
> - git blame --incremental file | \
> - egrep "^(author|summary) " > actual &&
> + git blame --incremental file >output &&
> + sed -ne "/^\(author\|summary\) /p" output >actual &&
These tests all crash and burn with BSD sed (including Mac OS X) since
you're not restricting yourself to BRE (basic regular expressions).
You _could_ request extended regular expressions, which do work on
those platforms, as well as with GNU sed:
sed -nEe "/^(author|summary) /p" ...
> test_cmp actual expected
> '
>
> @@ -52,8 +52,8 @@ EOF
> test_expect_success !MINGW \
> 'blame respects i18n.logoutputencoding' '
> git config i18n.logoutputencoding eucJP &&
> - git blame --incremental file | \
> - egrep "^(author|summary) " > actual &&
> + git blame --incremental file >output &&
> + sed -ne "/^\(author\|summary\) /p" output >actual &&
> test_cmp actual expected
> '
>
> @@ -68,8 +68,8 @@ EOF
>
> test_expect_success !MINGW \
> 'blame respects --encoding=UTF-8' '
> - git blame --incremental --encoding=UTF-8 file | \
> - egrep "^(author|summary) " > actual &&
> + git blame --incremental --encoding=UTF-8 file >output &&
> + sed -ne "/^\(author\|summary\) /p" output >actual &&
> test_cmp actual expected
> '
>
> @@ -84,8 +84,8 @@ EOF
>
> test_expect_success !MINGW \
> 'blame respects --encoding=none' '
> - git blame --incremental --encoding=none file | \
> - egrep "^(author|summary) " > actual &&
> + git blame --incremental --encoding=none file >output &&
> + sed -ne "/^\(author\|summary\) /p" output >actual &&
> test_cmp actual expected
> '
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html