From: Pat Thoyts <pattho...@users.sourceforge.net>
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 <pattho...@users.sourceforge.net>
Signed-off-by: Stepan Kasal <ka...@ucw.cz>
Signed-off-by: Torsten Bögershausen <tbo...@web.de>
---
This mini series mainly updates git.git with patches from msysgit:
Patch 1 is taken "as is",
Patch 2 is taken from msysgit "nearly as is": the broken && chain
had been fixed.
Changes since V2:
- Patch 1 shoud have the right Author line
(I used git-send-email for V2, where the Author was lost:
web.de does not allow to send mails with "From: Pat Thoyts" in the
mail header, so it will change it to "From: tboegi".
And git-send-email does not add another
"From: " line into the subject of the email, so I did it by hand)
Patch 2+3 had been squeezed together
(This may make the integration in msysgit a liitle bit harder)
Makefile | 3 +++
t/t0026-eol-config.sh | 18 ++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/Makefile b/Makefile
index 9f984a9..7d7db02 100644
--- a/Makefile
+++ b/Makefile
@@ -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
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
