On Fri, Apr 24, 2015 at 3:46 PM, Torsten Bögershausen <[email protected]> wrote:
> "new safer autocrlf handling":
> Check if eols in a file are converted at commit, when the file has
> CR (or CLLF) 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 <[email protected]>
> ---
> diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
> index 810934b..2482b2c 100755
> --- a/t/t0027-auto-crlf.sh
> +++ b/t/t0027-auto-crlf.sh
> @@ -71,12 +71,21 @@ commit_check_warn () {
> attr=$2
> lfname=$3
> crlfname=$4
> - lfmixcrlf=$5
> - lfmixcr=$6
> - crlfnul=$7
> - create_gitattributes "$attr" &&
> + repoMIX=$5
Unusual indentation.
> + lfmixcrlf=$6
> + lfmixcr=$7
> + crlfnul=$8
> pfx=crlf_${crlf}_attr_${attr}
> - for f in LF CRLF LF_mix_CR CRLF_mix_LF CRLF_nul
> + # 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 &&
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
