git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] t0027: Add repoMIX and LF_nul

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Apr 24, 2015, 20:07 UTC
Message-ID
<CAPig+cSFBoZ=pjvob0GEem-fzn7G_7uROgtVCViTXiXowN=AbQ@mail.gmail.com>
In-Reply-To
<553A9D93.60901@web.de>
On Fri, Apr 24, 2015 at 3:46 PM, Torsten Bögershausen <tboegi@web.de> wrote:
Show 28 quoted lines
> "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 <tboegi@web.de>
> ---
> 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.
Show 18 quoted lines
> +       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 &&
Previous: Torsten Bögershausen
Message 2 of 2 in “t0027: Add repoMIX and LF_nul”
  1. t0027: Add repoMIX and LF_nulTorsten Bögershausen, Apr 24, 2015
  2. Eric SunshineApr 24, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.