From: "Torsten Bögershausen" <tboegi@web.de>
To: "Yagnatinsky, Mark" <mark.yagnatinsky@bofa.com>
Cc: "'git@vger.kernel.org'" <git@vger.kernel.org>
Subject: Re: suggestion for improved docs on autocrlf
Date: Fri, 9 Aug 2019 05:34:06 +0200 [thread overview]
Message-ID: <20190809033406.5t5ag3qmh36ideec@tb-raspi4> (raw)
In-Reply-To: <577a66e0c26545aaa4795de3c5189c9d@bofa.com>
On Thu, Aug 08, 2019 at 11:08:14PM +0000, Yagnatinsky, Mark wrote:
> Okay, my attempt at better wording for the docs is not going well, because it turns I that I still don't understand the behavior here!
> I thought that "input" means that CRLF will become LF on "git add" but that seems to be true only sometimes.
> For instance, consider the following 11-line shell script:
>
> mkdir empty
> cd empty
> git init
> git config core.autocrlf false
> echo -e '1\r\n2' > test.txt
> git add .
> git commit -m test
> git config core.autocrlf input
> cp test.txt t2.txt
> echo 'a\r\nb' > test.txt
> git add .
>
> The output from the last git add is:
>
> warning: CRLF will be replaced by LF in t2.txt.
> The file will have its original line endings in your working directory.
>
> Which is a very good warning indeed, but why does it only apply to the new file t2.txt?
> Why does the existing file test.txt retain its CRLF line endings.
Because there are no CRLF ;-)
This line
echo 'a\r\nb' > test.txt
should probably be written as
echo -e 'a\r\nb' > test.txt
or better
printf 'a\r\nb' > test.txt
> I am so confused.
Please run
od -c test.txt
and may be
git ls-files --eol
>
> Any pointers?
https://git-scm.com/docs/git-add
What happens if you run the following:
mkdir empty
cd empty
git init
echo "* -text" >.gitattributes
printf '1\r\n2' > test.txt
git add .
git commit -m "Add test.txt with CRLF"
echo "* text=auto eol=lf" >.gitattributes
cp test.txt t2.txt
printf 'a\r\nb' > test.txt
git add .
git commit -m "cp text.txt t2.txt; change test.txt; eol=input"
git add --renormailze test.txt
git commit -m "Normalize line endings in text.txt"
next prev parent reply other threads:[~2019-08-09 3:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 13:08 suggestion for improved docs on autocrlf Yagnatinsky, Mark
2019-08-08 20:56 ` Torsten Bögershausen
2019-08-08 21:19 ` Yagnatinsky, Mark
2019-08-08 23:08 ` Yagnatinsky, Mark
2019-08-09 3:34 ` Torsten Bögershausen [this message]
2019-08-09 15:34 ` Yagnatinsky, Mark
2019-08-11 12:10 ` Torsten Bögershausen
2019-08-12 13:47 ` Yagnatinsky, Mark
2019-08-12 15:46 ` Junio C Hamano
2019-08-12 15:52 ` Yagnatinsky, Mark
2019-08-12 17:10 ` Torsten Bögershausen
2019-08-12 18:00 ` Yagnatinsky, Mark
2019-08-12 18:18 ` Junio C Hamano
2019-08-12 18:30 ` Yagnatinsky, Mark
2019-08-13 3:24 ` Torsten Bögershausen
2019-08-13 15:31 ` Yagnatinsky, Mark
2019-08-13 15:40 ` Torsten Bögershausen
2019-08-13 15:44 ` Yagnatinsky, Mark
2019-08-14 16:28 ` Yagnatinsky, Mark
2019-08-15 4:56 ` Yagnatinsky, Mark
2019-08-16 4:20 ` Torsten Bögershausen
2019-08-16 19:12 ` Yagnatinsky, Mark
2019-08-13 16:40 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190809033406.5t5ag3qmh36ideec@tb-raspi4 \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=mark.yagnatinsky@bofa.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).