Push the NATIVE_CRLF Makefile variable to C and added a test for native.

PATCH In review Torsten Bögershausen 2 participants 4 messages Jun 15, 2016 Kbuild

Share & tools

Torsten Bögershausen

author

2016-06-15 23:02 UTC #0 lore raw

PATCH v2 1/3 Push the NATIVE_CRLF Makefile variable to C and added a test for native.

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 <[email protected]>

Signed-off-by Stepan Kasal <[email protected]>

Signed-off-by Torsten Bögershausen <[email protected]>

---

This mini series mainly updates git.git with patches from msysgit:
Patch 1 is taken "as is",
Patch 2 is taken "as is",
and Patch 3 is the outcome of the code-review

Thanks for careful reading

 Makefile              |  3 +++
 t/t0026-eol-config.sh | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

Makefile +3 -0

index 2320de5..517036e 100644
@@ -1479,6 +1479,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

t/t0026-eol-config.sh +18 -0

index 4807b0f..43a580a 100755
@@ -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

Signature · 1 line

2.1.0.rc2.210.g636bceb

Junio C Hamano

2016-06-15 23:02 UTC #1 lore raw

Quoted 11 lines · Torsten Bögershausen

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 <[email protected]>
Signed-off-by Stepan Kasal <[email protected]>
Signed-off-by Torsten Bögershausen <[email protected]>
---

Who should I record as the author of this patch?

Quoted 32 lines

This mini series mainly updates git.git with patches from msysgit:
Patch 1 is taken "as is",
Patch 2 is taken "as is",
and Patch 3 is the outcome of the code-review
Thanks for careful reading
 Makefile              |  3 +++
 t/t0026-eol-config.sh | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)
Makefile +3 -0
index 2320de5..517036e 100644
@@ -1479,6 +1479,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
t/t0026-eol-config.sh +0 -0
index 4807b0f..43a580a 100755

t/t0026-eol-config.sh test_expect_success 'autocrlf=true overrides unset eol' ' · line 89

Quoted 10 lines

t/t0026-eol-config.sh +7 -0

@@ -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

I think I saw a few style fixes sent against the previous round of patches; have you missed them?

Quoted 12 lines

t/t0026-eol-config.sh +11 -0

+	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

Torsten Bögershausen

author

2016-06-15 23:02 UTC #2 lore raw

Quoted 9 lines · Junio C Hamano

Quoted 7 lines · Torsten Bögershausen
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.

Quoted 7 lines

Quoted 4 lines
Signed-off-by Pat Thoyts <[email protected]>
Signed-off-by Stepan Kasal <[email protected]>
Signed-off-by Torsten Bögershausen <[email protected]>
---
Who should I record as the author of this patch?

Sorry for missing this, here is what Mingw says:

commit 0caba2cacbb9d8e6a31783b45f1a13e52dec6ce8

Author: Pat Thoyts <[email protected]>
Date:   Mon Nov 26 00:24:00 2012 +0000

Push the NATIVE_CRLF Makefile variable to C and added a test for native.

Commit 95f31e9a correctly points out that the NATIVE_CRLF setting is
[]

Junio C Hamano

2016-06-15 23:02 UTC #3 lore raw

Quoted 20 lines · Torsten Bögershausen

Quoted 9 lines · Junio C Hamano
Quoted 7 lines · Torsten Bögershausen
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.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Pat Thoyts <[email protected]>
Signed-off-by Stepan Kasal <[email protected]>
Signed-off-by Torsten Bögershausen <[email protected]>
---
Who should I record as the author of this patch?
Sorry for missing this, here is what Mingw says:

Quoted 8 lines

commit 0caba2cacbb9d8e6a31783b45f1a13e52dec6ce8
Author: Pat Thoyts <[email protected]>
Date:   Mon Nov 26 00:24:00 2012 +0000
Push the NATIVE_CRLF Makefile variable to C and added a test for native.
Commit 95f31e9a correctly points out that the NATIVE_CRLF setting is
[]

When forwarding somebody else's patch, please start the *body* of your message with the in-body header to force the author, followed by a blank line and then the message, i.e.

From: Pat Thoyts <[email protected]>

Commit 95f31e9a correctly points out that the NATIVE_CRLF setting is incorrectly set on Mingw git. However, the Makefile variable is not...
...

The request applies to other patches in the series as well. I suspect that using send-email on format-patch output may do the right thing automatically.

Thanks.