mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
8eeab92f02
"new safer autocrlf handling":
- Check if eols in a file are converted at commit, when the file has
CR (or CRLF) in the repo (technically speaking in the index).
- Add a test-file repoMIX with mixed line-endings.
- When converting LF->CRLF or CRLF->LF: check the warnings
checkout_files():
- Checking out CRLF_nul and checking for eol coversion does not
make much sense (CRLF will stay CRLF).
- Use the file LF_nul instead: It is handled a binary in "auto" modes,
and when declared as text the LF may be replaced with CRLF, depending
on the configuration.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
360 lines
14 KiB
Bash
Executable file
360 lines
14 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='CRLF conversion all combinations'
|
|
|
|
. ./test-lib.sh
|
|
|
|
if ! test_have_prereq EXPENSIVE
|
|
then
|
|
skip_all="EXPENSIVE not set"
|
|
test_done
|
|
fi
|
|
|
|
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 () {
|
|
pfx=$1
|
|
exp=$2.expect
|
|
act=$pfx.actual.$3
|
|
tr '\015\000' QN <"$2" >"$exp" &&
|
|
tr '\015\000' QN <"$3" >"$act" &&
|
|
test_cmp $exp $act &&
|
|
rm $exp $act
|
|
}
|
|
|
|
create_gitattributes () {
|
|
attr=$1
|
|
case "$attr" in
|
|
auto)
|
|
echo "*.txt text=auto" >.gitattributes
|
|
;;
|
|
text)
|
|
echo "*.txt text" >.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
|
|
}
|
|
|
|
check_warning () {
|
|
case "$1" in
|
|
LF_CRLF) echo "warning: LF will be replaced by CRLF" >"$2".expect ;;
|
|
CRLF_LF) echo "warning: CRLF will be replaced by LF" >"$2".expect ;;
|
|
'') >"$2".expect ;;
|
|
*) echo >&2 "Illegal 1": "$1" ; return false ;;
|
|
esac
|
|
grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" >"$2".actual
|
|
test_cmp "$2".expect "$2".actual
|
|
}
|
|
|
|
commit_check_warn () {
|
|
crlf=$1
|
|
attr=$2
|
|
lfname=$3
|
|
crlfname=$4
|
|
repoMIX=$5
|
|
lfmixcrlf=$6
|
|
lfmixcr=$7
|
|
crlfnul=$8
|
|
pfx=crlf_${crlf}_attr_${attr}
|
|
# Special handling for repoMIX: It should already be in the repo
|
|
# with CRLF
|
|
f=repoMIX
|
|
fname=${pfx}_$f.txt
|
|
echo >.gitattributes &&
|
|
cp $f $fname &&
|
|
git -c core.autocrlf=false add $fname 2>"${pfx}_$f.err" &&
|
|
git commit -m "repoMIX" &&
|
|
create_gitattributes "$attr" &&
|
|
for f in LF CRLF repoMIX LF_mix_CR CRLF_mix_LF LF_nul CRLF_nul
|
|
do
|
|
fname=${pfx}_$f.txt &&
|
|
cp $f $fname &&
|
|
git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err"
|
|
done &&
|
|
git commit -m "core.autocrlf $crlf" &&
|
|
check_warning "$lfname" ${pfx}_LF.err &&
|
|
check_warning "$crlfname" ${pfx}_CRLF.err &&
|
|
check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err &&
|
|
check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err &&
|
|
check_warning "$crlfnul" ${pfx}_CRLF_nul.err
|
|
}
|
|
|
|
check_files_in_repo () {
|
|
crlf=$1
|
|
attr=$2
|
|
lfname=$3
|
|
crlfname=$4
|
|
lfmixcrlf=$5
|
|
lfmixcr=$6
|
|
crlfnul=$7
|
|
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 &&
|
|
compare_files $lfmixcr ${pfx}LF_mix_CR.txt &&
|
|
compare_files $crlfnul ${pfx}CRLF_nul.txt
|
|
}
|
|
|
|
|
|
checkout_files () {
|
|
eol=$1
|
|
crlf=$2
|
|
attr=$3
|
|
lfname=$4
|
|
crlfname=$5
|
|
lfmixcrlf=$6
|
|
lfmixcr=$7
|
|
crlfnul=$8
|
|
create_gitattributes $attr &&
|
|
git config core.autocrlf $crlf &&
|
|
pfx=eol_${eol}_crlf_${crlf}_attr_${attr}_ &&
|
|
src=crlf_false_attr__ &&
|
|
for f in LF CRLF LF_mix_CR CRLF_mix_LF LF_nul
|
|
do
|
|
rm $src$f.txt &&
|
|
if test -z "$eol"; then
|
|
git checkout $src$f.txt
|
|
else
|
|
git -c core.eol=$eol checkout $src$f.txt
|
|
fi
|
|
done
|
|
|
|
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=$attr file=CRLF" "
|
|
compare_ws_file $pfx $crlfname ${src}CRLF.txt
|
|
"
|
|
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=$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=$attr file=LF_nul" "
|
|
compare_ws_file $pfx $crlfnul ${src}LF_nul.txt
|
|
"
|
|
}
|
|
|
|
#######
|
|
test_expect_success 'setup master' '
|
|
echo >.gitattributes &&
|
|
git checkout -b master &&
|
|
git add .gitattributes &&
|
|
git commit -m "add .gitattributes" "" &&
|
|
printf "line1\nline2\nline3" >LF &&
|
|
printf "line1\r\nline2\r\nline3" >CRLF &&
|
|
printf "line1\r\nline2\nline3" >repoMIX &&
|
|
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
|
|
'
|
|
|
|
|
|
|
|
warn_LF_CRLF="LF will be replaced by CRLF"
|
|
warn_CRLF_LF="CRLF will be replaced by LF"
|
|
|
|
# WILC stands for "Warn if (this OS) converts LF into CRLF".
|
|
# WICL: Warn if CRLF becomes LF
|
|
# WAMIX: Mixed line endings: either CRLF->LF or LF->CRLF
|
|
if test_have_prereq NATIVE_CRLF
|
|
then
|
|
WILC=LF_CRLF
|
|
WICL=
|
|
WAMIX=LF_CRLF
|
|
else
|
|
WILC=
|
|
WICL=CRLF_LF
|
|
WAMIX=CRLF_LF
|
|
fi
|
|
|
|
# attr LF CRLF repoMIX CRLFmixLF LFmixCR CRLFNUL
|
|
test_expect_success 'commit files empty attr' '
|
|
commit_check_warn false "" "" "" "" "" "" "" &&
|
|
commit_check_warn true "" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" "" &&
|
|
commit_check_warn input "" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" ""
|
|
'
|
|
|
|
test_expect_success 'commit files attr=auto' '
|
|
commit_check_warn false "auto" "$WILC" "$WICL" "$WAMIX" "$WAMIX" "" "" &&
|
|
commit_check_warn true "auto" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" "" &&
|
|
commit_check_warn input "auto" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" ""
|
|
'
|
|
|
|
test_expect_success 'commit files attr=text' '
|
|
commit_check_warn false "text" "$WILC" "$WICL" "$WAMIX" "$WAMIX" "$WILC" "$WICL" &&
|
|
commit_check_warn true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "LF_CRLF" "" &&
|
|
commit_check_warn input "text" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "CRLF_LF"
|
|
'
|
|
|
|
test_expect_success 'commit files attr=-text' '
|
|
commit_check_warn false "-text" "" "" "" "" "" "" &&
|
|
commit_check_warn true "-text" "" "" "" "" "" "" &&
|
|
commit_check_warn input "-text" "" "" "" "" "" ""
|
|
'
|
|
|
|
test_expect_success 'commit files attr=lf' '
|
|
commit_check_warn false "lf" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" &&
|
|
commit_check_warn true "lf" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" &&
|
|
commit_check_warn input "lf" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "CRLF_LF"
|
|
'
|
|
|
|
test_expect_success 'commit files attr=crlf' '
|
|
commit_check_warn false "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "LF_CRLF" "" &&
|
|
commit_check_warn true "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "LF_CRLF" "" &&
|
|
commit_check_warn input "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "LF_CRLF" ""
|
|
'
|
|
|
|
test_expect_success 'create files cleanup' '
|
|
rm -f *.txt &&
|
|
git reset --hard
|
|
'
|
|
|
|
test_expect_success 'commit empty gitattribues' '
|
|
check_files_in_repo false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
|
|
check_files_in_repo true "" LF LF LF LF_mix_CR CRLF_nul &&
|
|
check_files_in_repo input "" LF LF LF LF_mix_CR CRLF_nul
|
|
'
|
|
|
|
test_expect_success 'commit text=auto' '
|
|
check_files_in_repo false "auto" LF LF LF LF_mix_CR CRLF_nul &&
|
|
check_files_in_repo true "auto" LF LF LF LF_mix_CR CRLF_nul &&
|
|
check_files_in_repo input "auto" LF LF LF LF_mix_CR CRLF_nul
|
|
'
|
|
|
|
test_expect_success 'commit text' '
|
|
check_files_in_repo false "text" LF LF LF LF_mix_CR LF_nul &&
|
|
check_files_in_repo true "text" LF LF LF LF_mix_CR LF_nul &&
|
|
check_files_in_repo input "text" LF LF LF LF_mix_CR LF_nul
|
|
'
|
|
|
|
test_expect_success 'commit -text' '
|
|
check_files_in_repo false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
|
|
check_files_in_repo true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
|
|
check_files_in_repo input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
|
|
'
|
|
|
|
################################################################################
|
|
# Check how files in the repo are changed when they are checked out
|
|
# How to read the table below:
|
|
# - checkout_files 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
|
|
# - parameter $4 : reference for a file with only LF in the repo
|
|
# - parameter $5 : reference for a file with only CRLF in the repo
|
|
# - parameter $6 : reference for a file with mixed LF and CRLF in the repo
|
|
# - 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)
|
|
|
|
# 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 NATIVE_CRLF
|
|
then
|
|
MIX_CRLF_LF=CRLF
|
|
MIX_LF_CR=CRLF_mix_CR
|
|
NL=CRLF
|
|
LFNUL=CRLF_nul
|
|
else
|
|
MIX_CRLF_LF=CRLF_mix_LF
|
|
MIX_LF_CR=LF_mix_CR
|
|
NL=LF
|
|
LFNUL=LF_nul
|
|
fi
|
|
export CRLF_MIX_LF_CR MIX NL
|
|
|
|
checkout_files lf false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf false "auto" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf true "auto" CRLF CRLF CRLF LF_mix_CR LF_nul
|
|
checkout_files lf input "auto" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf false "text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files lf input "text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf input "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf false "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf true "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf input "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files lf false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files lf true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files lf input "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
|
|
checkout_files crlf false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files crlf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files crlf false "auto" CRLF CRLF CRLF LF_mix_CR LF_nul
|
|
checkout_files crlf true "auto" CRLF CRLF CRLF LF_mix_CR LF_nul
|
|
checkout_files crlf false "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files crlf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files crlf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files crlf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files crlf false "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files crlf true "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files crlf false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files crlf true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
|
|
checkout_files "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" false "auto" $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul
|
|
checkout_files "" true "auto" CRLF CRLF CRLF LF_mix_CR LF_nul
|
|
checkout_files "" input "auto" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" false "text" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL
|
|
checkout_files "" true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files "" input "text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" false "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" true "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" input "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" false "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" true "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" input "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files "" false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files "" true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files "" input "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
|
|
checkout_files native false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files native true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files native false "auto" $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul
|
|
checkout_files native true "auto" CRLF CRLF CRLF LF_mix_CR LF_nul
|
|
checkout_files native false "text" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL
|
|
checkout_files native true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files native false "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files native true "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files native false "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files native true "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
|
|
checkout_files native false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
checkout_files native true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
|
|
|
test_done
|