mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'tb/crlf-tests'
* tb/crlf-tests: MinGW: update tests to handle a native eol of crlf Makefile: propagate NATIVE_CRLF to C t0027: Tests for core.eol=native, eol=lf, eol=crlf
This commit is contained in:
Junio C Hamano
commit
70f003e107
3
Makefile
3
Makefile
|
|
@ -1348,6 +1348,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
|
||||
|
|
|
|||
|
|
@ -80,4 +80,24 @@ 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
|
||||
|
|
|
|||
|
|
@ -10,30 +10,26 @@ then
|
|||
test_done
|
||||
fi
|
||||
|
||||
|
||||
compare_files()
|
||||
{
|
||||
od -c <"$1" >"$1".expect &&
|
||||
od -c <"$2" >"$2".actual &&
|
||||
compare_files () {
|
||||
tr '\015\000' QN <"$1" >"$1".expect &&
|
||||
tr '\015\000' QN <"$2" >"$2".actual &&
|
||||
test_cmp "$1".expect "$2".actual &&
|
||||
rm "$1".expect "$2".actual
|
||||
}
|
||||
|
||||
compare_ws_file()
|
||||
{
|
||||
compare_ws_file () {
|
||||
pfx=$1
|
||||
exp=$2.expect
|
||||
act=$pfx.actual.$3
|
||||
od -c <"$2" >"$exp" &&
|
||||
od -c <"$3" >"$act" &&
|
||||
tr '\015\000' QN <"$2" >"$exp" &&
|
||||
tr '\015\000' QN <"$3" >"$act" &&
|
||||
test_cmp $exp $act &&
|
||||
rm $exp $act
|
||||
}
|
||||
|
||||
create_gitattributes()
|
||||
{
|
||||
txtbin=$1
|
||||
case "$txtbin" in
|
||||
create_gitattributes () {
|
||||
attr=$1
|
||||
case "$attr" in
|
||||
auto)
|
||||
echo "*.txt text=auto" >.gitattributes
|
||||
;;
|
||||
|
|
@ -43,35 +39,43 @@ create_gitattributes()
|
|||
-text)
|
||||
echo "*.txt -text" >.gitattributes
|
||||
;;
|
||||
*)
|
||||
crlf)
|
||||
echo "*.txt eol=crlf" >.gitattributes
|
||||
;;
|
||||
lf)
|
||||
echo "*.txt eol=lf" >.gitattributes
|
||||
;;
|
||||
"")
|
||||
echo >.gitattributes
|
||||
;;
|
||||
*)
|
||||
echo >&2 invalid attribute: $attr
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
create_file_in_repo()
|
||||
{
|
||||
create_file_in_repo () {
|
||||
crlf=$1
|
||||
txtbin=$2
|
||||
create_gitattributes "$txtbin" &&
|
||||
attr=$2
|
||||
create_gitattributes "$attr" &&
|
||||
for f in LF CRLF LF_mix_CR CRLF_mix_LF CRLF_nul
|
||||
do
|
||||
pfx=crlf_${crlf}_attr_${txtbin}_$f.txt &&
|
||||
pfx=crlf_${crlf}_attr_${attr}_$f.txt &&
|
||||
cp $f $pfx && git -c core.autocrlf=$crlf add $pfx
|
||||
done &&
|
||||
git commit -m "core.autocrlf $crlf"
|
||||
}
|
||||
|
||||
check_files_in_repo()
|
||||
{
|
||||
check_files_in_repo () {
|
||||
crlf=$1
|
||||
txtbin=$2
|
||||
attr=$2
|
||||
lfname=$3
|
||||
crlfname=$4
|
||||
lfmixcrlf=$5
|
||||
lfmixcr=$6
|
||||
crlfnul=$7
|
||||
pfx=crlf_${crlf}_attr_${txtbin}_ &&
|
||||
pfx=crlf_${crlf}_attr_${attr}_ &&
|
||||
compare_files $lfname ${pfx}LF.txt &&
|
||||
compare_files $crlfname ${pfx}CRLF.txt &&
|
||||
compare_files $lfmixcrlf ${pfx}CRLF_mix_LF.txt &&
|
||||
|
|
@ -80,19 +84,18 @@ check_files_in_repo()
|
|||
}
|
||||
|
||||
|
||||
check_files_in_ws()
|
||||
{
|
||||
check_files_in_ws () {
|
||||
eol=$1
|
||||
crlf=$2
|
||||
txtbin=$3
|
||||
attr=$3
|
||||
lfname=$4
|
||||
crlfname=$5
|
||||
lfmixcrlf=$6
|
||||
lfmixcr=$7
|
||||
crlfnul=$8
|
||||
create_gitattributes $txtbin &&
|
||||
create_gitattributes $attr &&
|
||||
git config core.autocrlf $crlf &&
|
||||
pfx=eol_${eol}_crlf_${crlf}_attr_${txtbin}_ &&
|
||||
pfx=eol_${eol}_crlf_${crlf}_attr_${attr}_ &&
|
||||
src=crlf_false_attr__ &&
|
||||
for f in LF CRLF LF_mix_CR CRLF_mix_LF CRLF_nul
|
||||
do
|
||||
|
|
@ -104,42 +107,24 @@ check_files_in_ws()
|
|||
fi
|
||||
done
|
||||
|
||||
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$txtbin file=LF" "
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=LF" "
|
||||
compare_ws_file $pfx $lfname ${src}LF.txt
|
||||
"
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$txtbin file=CRLF" "
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=CRLF" "
|
||||
compare_ws_file $pfx $crlfname ${src}CRLF.txt
|
||||
"
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$txtbin file=CRLF_mix_LF" "
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=CRLF_mix_LF" "
|
||||
compare_ws_file $pfx $lfmixcrlf ${src}CRLF_mix_LF.txt
|
||||
"
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$txtbin file=LF_mix_CR" "
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=LF_mix_CR" "
|
||||
compare_ws_file $pfx $lfmixcr ${src}LF_mix_CR.txt
|
||||
"
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$txtbin file=CRLF_nul" "
|
||||
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=CRLF_nul" "
|
||||
compare_ws_file $pfx $crlfnul ${src}CRLF_nul.txt
|
||||
"
|
||||
}
|
||||
|
||||
#######
|
||||
(
|
||||
type od >/dev/null &&
|
||||
printf "line1Q\r\nline2\r\nline3" | q_to_nul >CRLF_nul &&
|
||||
cat >expect <<-EOF &&
|
||||
0000000 l i n e 1 \0 \r \n l i n e 2 \r \n l
|
||||
0000020 i n e 3
|
||||
0000024
|
||||
EOF
|
||||
od -c CRLF_nul | sed -e "s/[ ][ ]*/ /g" -e "s/ *$//" >actual
|
||||
test_cmp expect actual &&
|
||||
rm expect actual
|
||||
) || {
|
||||
skip_all="od not found or od -c not usable"
|
||||
exit 0
|
||||
test_done
|
||||
}
|
||||
|
||||
test_expect_success 'setup master' '
|
||||
echo >.gitattributes &&
|
||||
git checkout -b master &&
|
||||
|
|
@ -150,9 +135,10 @@ test_expect_success 'setup master' '
|
|||
printf "line1\r\nline2\nline3" >CRLF_mix_LF &&
|
||||
printf "line1\nline2\rline3" >LF_mix_CR &&
|
||||
printf "line1\r\nline2\rline3" >CRLF_mix_CR &&
|
||||
printf "line1Q\r\nline2\r\nline3" | q_to_nul >CRLF_nul &&
|
||||
printf "line1Q\nline2\nline3" | q_to_nul >LF_nul
|
||||
'
|
||||
# CRLF_nul had been created above
|
||||
|
||||
|
||||
test_expect_success 'create files' '
|
||||
create_file_in_repo false "" &&
|
||||
|
|
@ -201,7 +187,8 @@ test_expect_success 'commit -text' '
|
|||
################################################################################
|
||||
# Check how files in the repo are changed when they are checked out
|
||||
# How to read the table below:
|
||||
# - check_files_in_ws will check multiple files, see below
|
||||
# - check_files_in_ws will check multiple files with a combination of settings
|
||||
# and attributes (core.autocrlf=input is forbidden with core.eol=crlf)
|
||||
# - parameter $1 : core.eol lf | crlf
|
||||
# - parameter $2 : core.autocrlf false | true | input
|
||||
# - parameter $3 : text in .gitattributs "" (empty) | auto | text | -text
|
||||
|
|
@ -211,55 +198,88 @@ test_expect_success 'commit -text' '
|
|||
# - parameter $7 : reference for a file with LF and CR in the repo (does somebody uses this ?)
|
||||
# - parameter $8 : reference for a file with CRLF and a NUL (should be handled as binary when auto)
|
||||
|
||||
check_files_in_ws lf false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws lf false "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws lf false "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws lf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
|
||||
###########
|
||||
#core.autocrlf=input is forbidden with core.eol=crlf
|
||||
check_files_in_ws crlf false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws crlf false "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws crlf false "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws crlf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
|
||||
# What we have in the repo:
|
||||
# ----------------- EOL in repo ----------------
|
||||
# LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
# settings with checkout:
|
||||
# core. core. .gitattr
|
||||
# eol acrlf
|
||||
# ----------------------------------------------
|
||||
# What we want to have in the working tree:
|
||||
if test_have_prereq MINGW
|
||||
then
|
||||
check_files_in_ws "" false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" false "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" false "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws native false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native false "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native false "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws native false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
MIX_CRLF_LF=CRLF
|
||||
MIX_LF_CR=CRLF_mix_CR
|
||||
NL=CRLF
|
||||
else
|
||||
MIX_CRLF_LF=CRLF_mix_LF
|
||||
MIX_LF_CR=LF_mix_CR
|
||||
NL=LF
|
||||
fi
|
||||
export CRLF_MIX_LF_CR MIX NL
|
||||
|
||||
check_files_in_ws lf false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf false "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf false "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf false "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws lf input "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws crlf false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf false "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf false "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf false "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws crlf true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws "" false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" input "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" false "auto" $NL CRLF $MIX_CRLF_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" input "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" false "text" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR CRLF_nul
|
||||
check_files_in_ws "" true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" input "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" false "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" input "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws "" input "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
|
||||
check_files_in_ws native false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native false "auto" $NL CRLF $MIX_CRLF_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native false "text" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR CRLF_nul
|
||||
check_files_in_ws native true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws native false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native false "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
||||
check_files_in_ws native false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
check_files_in_ws native true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
|
||||
test_done
|
||||
|
|
|
|||
|
|
@ -72,6 +72,10 @@ 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 &&
|
||||
git config merge.renormalize true &&
|
||||
git rm -fr . &&
|
||||
rm -f .gitattributes &&
|
||||
|
|
@ -86,6 +90,10 @@ 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 &&
|
||||
git config merge.renormalize true &&
|
||||
git rm -fr . &&
|
||||
rm -f .gitattributes &&
|
||||
|
|
@ -95,16 +103,19 @@ test_expect_success 'Merge addition of text=auto' '
|
|||
'
|
||||
|
||||
test_expect_success 'Detect CRLF/LF conflict after setting text=auto' '
|
||||
q_to_cr <<-\EOF >expected &&
|
||||
<<<<<<<
|
||||
first line
|
||||
same line
|
||||
=======
|
||||
first lineQ
|
||||
same lineQ
|
||||
>>>>>>>
|
||||
EOF
|
||||
|
||||
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 ">>>>>>>" >>expected &&
|
||||
git config merge.renormalize false &&
|
||||
rm -f .gitattributes &&
|
||||
git reset --hard a &&
|
||||
|
|
@ -114,16 +125,19 @@ test_expect_success 'Detect CRLF/LF conflict after setting text=auto' '
|
|||
'
|
||||
|
||||
test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' '
|
||||
q_to_cr <<-\EOF >expected &&
|
||||
<<<<<<<
|
||||
first lineQ
|
||||
same lineQ
|
||||
=======
|
||||
first line
|
||||
same line
|
||||
>>>>>>>
|
||||
EOF
|
||||
|
||||
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 ">>>>>>>" >>expected &&
|
||||
git config merge.renormalize false &&
|
||||
rm -f .gitattributes &&
|
||||
git reset --hard b &&
|
||||
|
|
|
|||
|
|
@ -870,6 +870,7 @@ case $(uname -s) in
|
|||
# backslashes in pathspec are converted to '/'
|
||||
# exec does not inherit the PID
|
||||
test_set_prereq MINGW
|
||||
test_set_prereq NATIVE_CRLF
|
||||
test_set_prereq SED_STRIPS_CR
|
||||
test_set_prereq GREP_STRIPS_CR
|
||||
GIT_TEST_CMP=mingw_test_cmp
|
||||
|
|
|
|||
Loading…
Reference in a new issue