Re: [PATCH v1 1/1] t6038; use crlf on all platforms
Show 7 quoted lines
> From: Torsten Bögershausen <tboegi@web.de>
>
> t6038 uses different code, depending if NATIVE_CRLF is set ot not.
> When the native line endings are LF, merge.renormalize is not tested very well.
> Change the test to always use CRLF by setting core.eol=crlf.
> ---
> Broke the 10/10 series into smaller pieces, this is the update of t6038
Thanks.
- Missing sign-off.
- "... is not tested very well", which implies "with this change,
it will be tested", is a secondary benefit. The reader need to
agree that, whether the platform native line ending is CRLF or
LF, 'git merge' should behave identically on any platform, as
long as the line ending convention used in the repository is
explicitly set in the same way, before agreeing that this is a
good thing to do in general. And that is a bigger benefit, no?
- But doesn't the same principle apply in the other direction?
When forced to do core.eol=lf, a platform with NATIVE_CRLF should
behave identically to how a platform without NATIVE_CRLF would?
With this patch, we lose test coverage for core.eol=lf case,
which used to be tested on non-NATIVE_CRLF platforms. Isn't that
a concern to us?
Show 79 quoted lines
> t/t6038-merge-text-auto.sh | 37 +++++++++++--------------------------
> 1 file changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
> index 85c10b0..4dc8c1a 100755
> --- a/t/t6038-merge-text-auto.sh
> +++ b/t/t6038-merge-text-auto.sh
> @@ -18,6 +18,7 @@ test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
>
> test_expect_success setup '
> git config core.autocrlf false &&
> + git config core.eol crlf &&
>
> echo first line | append_cr >file &&
> echo first line >control_file &&
> @@ -72,10 +73,8 @@ test_expect_success 'Merge after setting text=auto' '
> same line
> EOF
>
> - if test_have_prereq NATIVE_CRLF; then
> - append_cr <expected >expected.temp &&
> - mv expected.temp expected
> - fi &&
> + append_cr <expected >expected.temp &&
> + mv expected.temp expected &&
> git config merge.renormalize true &&
> git rm -fr . &&
> rm -f .gitattributes &&
> @@ -90,10 +89,8 @@ test_expect_success 'Merge addition of text=auto' '
> same line
> EOF
>
> - if test_have_prereq NATIVE_CRLF; then
> - append_cr <expected >expected.temp &&
> - mv expected.temp expected
> - fi &&
> + append_cr <expected >expected.temp &&
> + mv expected.temp expected &&
> git config merge.renormalize true &&
> git rm -fr . &&
> rm -f .gitattributes &&
> @@ -104,15 +101,9 @@ test_expect_success 'Merge addition of text=auto' '
>
> test_expect_success 'Detect CRLF/LF conflict after setting text=auto' '
> echo "<<<<<<<" >expected &&
> - if test_have_prereq NATIVE_CRLF; then
> - echo first line | append_cr >>expected &&
> - echo same line | append_cr >>expected &&
> - echo ======= | append_cr >>expected
> - else
> - echo first line >>expected &&
> - echo same line >>expected &&
> - echo ======= >>expected
> - fi &&
> + echo first line | append_cr >>expected &&
> + echo same line | append_cr >>expected &&
> + echo ======= | append_cr >>expected &&
> echo first line | append_cr >>expected &&
> echo same line | append_cr >>expected &&
> echo ">>>>>>>" >>expected &&
> @@ -128,15 +119,9 @@ test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' '
> echo "<<<<<<<" >expected &&
> echo first line | append_cr >>expected &&
> echo same line | append_cr >>expected &&
> - if test_have_prereq NATIVE_CRLF; then
> - echo ======= | append_cr >>expected &&
> - echo first line | append_cr >>expected &&
> - echo same line | append_cr >>expected
> - else
> - echo ======= >>expected &&
> - echo first line >>expected &&
> - echo same line >>expected
> - fi &&
> + echo ======= | append_cr >>expected &&
> + echo first line | append_cr >>expected &&
> + echo same line | append_cr >>expected &&
> echo ">>>>>>>" >>expected &&
> git config merge.renormalize false &&
> rm -f .gitattributes &&
Junio C Hamano <gitster@pobox.com>