Makefile: propagate NATIVE_CRLF to C
Commit 95f31e9a
(convert: The native line-ending is \r\n on MinGW,
2010-09-04) 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 <patthoyts@users.sourceforge.net>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
parent
f6975a6b11
commit
5491e9e29e
3
Makefile
3
Makefile
|
@ -1474,6 +1474,9 @@ ifdef NO_REGEX
|
||||||
COMPAT_CFLAGS += -Icompat/regex
|
COMPAT_CFLAGS += -Icompat/regex
|
||||||
COMPAT_OBJS += compat/regex/regex.o
|
COMPAT_OBJS += compat/regex/regex.o
|
||||||
endif
|
endif
|
||||||
|
ifdef NATIVE_CRLF
|
||||||
|
BASIC_CFLAGS += -DNATIVE_CRLF
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef USE_NED_ALLOCATOR
|
ifdef USE_NED_ALLOCATOR
|
||||||
COMPAT_CFLAGS += -Icompat/nedmalloc
|
COMPAT_CFLAGS += -Icompat/nedmalloc
|
||||||
|
|
|
@ -80,4 +80,24 @@ test_expect_success 'autocrlf=true overrides unset eol' '
|
||||||
test -z "$onediff" && test -z "$twodiff"
|
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
|
test_done
|
||||||
|
|
Loading…
Reference in New Issue