# [PATCH] Push the NATIVE_CRLF Makefile variable to C and added a test for native. 3 messages from 2014-08-18 to 2014-08-19. Participants: Torsten Bögershausen, Eric Sunshine, Junio C Hamano. Thread: https://gitlist.dev/t/37372 ## Torsten Bögershausen, 2014-08-18 19:31 Subject: [PATCH] Push the NATIVE_CRLF Makefile variable to C and added a test for native. Message-ID: <53F25488.8000103@web.de> URL: https://gitlist.dev/e/53F25488.8000103%40web.de ``` Commit 95f31e9a correctly points out that the NATIVE_CRLF setting is incorrectly set on Mingw git. However, the Makefile variable is not propagated to the C preprocessor and results in no change. This patch pushes the definition to the C code and adds a test to validate that when core.eol as native is crlf, we actually normalize text files to this line ending convention when core.autocrlf is false. Signed-off-by: Pat Thoyts Signed-off-by: Stepan Kasal Signed-off-by: Torsten Bögershausen --- (This is from MINGW, and some part of my brain thougth that this was send upstream, but it wasn't. Only 95f31e9a is in git.git) Makefile | 3 +++ t/t0026-eol-config.sh | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/Makefile b/Makefile index 63a210d..13311d2 100644 --- a/Makefile +++ b/Makefile @@ -1481,6 +1481,9 @@ ifdef NO_REGEX COMPAT_CFLAGS += -Icompat/regex COMPAT_OBJS += compat/regex/regex.o endif +ifdef NATIVE_CRLF + BASIC_CFLAGS += -DNATIVE_CRLF +endif ifdef USE_NED_ALLOCATOR COMPAT_CFLAGS += -Icompat/nedmalloc diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh index 4807b0f..43a580a 100755 --- a/t/t0026-eol-config.sh +++ b/t/t0026-eol-config.sh @@ -80,4 +80,22 @@ test_expect_success 'autocrlf=true overrides unset eol' ' test -z "$onediff" && test -z "$twodiff" ' +test_expect_success NATIVE_CRLF 'eol native is crlf' ' + + rm -rf native_eol && mkdir native_eol && + ( cd native_eol && + printf "*.txt text\n" > .gitattributes + printf "one\r\ntwo\r\nthree\r\n" > filedos.txt + printf "one\ntwo\nthree\n" > fileunix.txt + git init && + git config core.autocrlf false && + git config core.eol native && + git add filedos.txt fileunix.txt && + git commit -m "first" && + rm file*.txt && + git reset --hard HEAD && + has_cr filedos.txt && has_cr fileunix.txt + ) +' + test_done -- 2.1.0.rc2.210.g636bceb ``` ## Eric Sunshine, 2014-08-19 04:44 Subject: Re: [PATCH] Push the NATIVE_CRLF Makefile variable to C and added a test for native. Message-ID: URL: https://gitlist.dev/e/CAPig%2BcT4PidGPBE3aQKWme%2BeXcY3a1LEQNt%2B5eWQNzZ1jCqz6A%40mail.gmail.com In-Reply-To: <53F25488.8000103@web.de> ``` On Mon, Aug 18, 2014 at 3:31 PM, Torsten Bögershausen wrote: > Commit 95f31e9a correctly points out that the NATIVE_CRLF setting is > incorrectly set on Mingw git. However, the Makefile variable is not > propagated to the C preprocessor and results in no change. This patch > pushes the definition to the C code and adds a test to validate that > when core.eol as native is crlf, we actually normalize text files to this > line ending convention when core.autocrlf is false. > > Signed-off-by: Pat Thoyts > Signed-off-by: Stepan Kasal > Signed-off-by: Torsten Bögershausen > --- > > (This is from MINGW, and some part of my brain thougth that this was send > upstream, but it wasn't. Only 95f31e9a is in git.git) > > Makefile | 3 +++ > t/t0026-eol-config.sh | 18 ++++++++++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/Makefile b/Makefile > index 63a210d..13311d2 100644 > --- a/Makefile > +++ b/Makefile > @@ -1481,6 +1481,9 @@ ifdef NO_REGEX > COMPAT_CFLAGS += -Icompat/regex > COMPAT_OBJS += compat/regex/regex.o > endif > +ifdef NATIVE_CRLF > + BASIC_CFLAGS += -DNATIVE_CRLF > +endif > > ifdef USE_NED_ALLOCATOR > COMPAT_CFLAGS += -Icompat/nedmalloc > diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh > index 4807b0f..43a580a 100755 > --- a/t/t0026-eol-config.sh > +++ b/t/t0026-eol-config.sh > @@ -80,4 +80,22 @@ test_expect_success 'autocrlf=true overrides unset eol' ' > test -z "$onediff" && test -z "$twodiff" > ' > > +test_expect_success NATIVE_CRLF 'eol native is crlf' ' > + > + rm -rf native_eol && mkdir native_eol && > + ( cd native_eol && > + printf "*.txt text\n" > .gitattributes > + printf "one\r\ntwo\r\nthree\r\n" > filedos.txt > + printf "one\ntwo\nthree\n" > fileunix.txt Broken &&-chain (3 lines). > + git init && > + git config core.autocrlf false && > + git config core.eol native && > + git add filedos.txt fileunix.txt && > + git commit -m "first" && > + rm file*.txt && > + git reset --hard HEAD && > + has_cr filedos.txt && has_cr fileunix.txt > + ) > +' > + > test_done > -- > 2.1.0.rc2.210.g636bceb ``` ## Junio C Hamano, 2014-08-19 18:19 Subject: Re: [PATCH] Push the NATIVE_CRLF Makefile variable to C and added a test for native. Message-ID: URL: https://gitlist.dev/e/xmqqsiksuytc.fsf%40gitster.dls.corp.google.com In-Reply-To: <53F25488.8000103@web.de> ``` Torsten Bögershausen writes: > Commit 95f31e9a correctly points out that the NATIVE_CRLF setting is > incorrectly set on Mingw git. However, the Makefile variable is not > propagated to the C preprocessor and results in no change. This patch > pushes the definition to the C code and adds a test to validate that > when core.eol as native is crlf, we actually normalize text files to this > line ending convention when core.autocrlf is false. > > Signed-off-by: Pat Thoyts > Signed-off-by: Stepan Kasal > Signed-off-by: Torsten Bögershausen > --- > > (This is from MINGW, and some part of my brain thougth that this was send > upstream, but it wasn't. Only 95f31e9a is in git.git) > > Makefile | 3 +++ > t/t0026-eol-config.sh | 18 ++++++++++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/Makefile b/Makefile > index 63a210d..13311d2 100644 > --- a/Makefile > +++ b/Makefile > @@ -1481,6 +1481,9 @@ ifdef NO_REGEX > COMPAT_CFLAGS += -Icompat/regex > COMPAT_OBJS += compat/regex/regex.o > endif > +ifdef NATIVE_CRLF > + BASIC_CFLAGS += -DNATIVE_CRLF > +endif > > ifdef USE_NED_ALLOCATOR > COMPAT_CFLAGS += -Icompat/nedmalloc > diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh > index 4807b0f..43a580a 100755 > --- a/t/t0026-eol-config.sh > +++ b/t/t0026-eol-config.sh > @@ -80,4 +80,22 @@ test_expect_success 'autocrlf=true overrides unset eol' ' > test -z "$onediff" && test -z "$twodiff" > ' > > +test_expect_success NATIVE_CRLF 'eol native is crlf' ' Who defines this test prerequisite? > + > + rm -rf native_eol && mkdir native_eol && > + ( cd native_eol && > + printf "*.txt text\n" > .gitattributes > + printf "one\r\ntwo\r\nthree\r\n" > filedos.txt > + printf "one\ntwo\nthree\n" > fileunix.txt Style and nits: - No SP between a redirection operator and its target. - Broken && chain. - Not indented. i.e. rm -rf native_eol && mkdir native_eol && ( cd native_eol && printf ... >.gitattributes && ... has_cr filedos.txt && has_cr fileunix.txt ) > + git init && > + git config core.autocrlf false && > + git config core.eol native && > + git add filedos.txt fileunix.txt && > + git commit -m "first" && > + rm file*.txt && > + git reset --hard HEAD && > + has_cr filedos.txt && has_cr fileunix.txt > + ) > +' > + > test_done ```