From: "Torsten Bögershausen" <tboegi@web.de>
To: Ashish Negi <ashishnegi33@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Changing encoding of a file : What should happen to CRLF in file ?
Date: Wed, 15 Nov 2017 18:12:58 +0100 [thread overview]
Message-ID: <20171115171258.GA12963@tor.lan> (raw)
In-Reply-To: <CAJ_+vJ6SxLOmZfG79Sa-vskBR-XG=C97--PB-vpijjUKym=jYw@mail.gmail.com>
On Wed, Nov 15, 2017 at 01:41:42PM +0530, Ashish Negi wrote:
> > If you commit the file, it will be stored with LF in the index,
> This is what i believe is not happening.
>
> Lets do this with a public repository and steps which are reproducible.
> I have created a repo : https://github.com/ashishnegi/git_encoding
>
> If you clone this repo in linux and run `git status`, you will find
> that file is modified.
This is what what I get:
git ls-files --eol
i/lf w/lf attr/text=auto .gitattributes
i/crlf w/crlf attr/text=auto file_name.txt
(And you get the same, I think)
Newer versions of Git (>=2.10) will -not- treat file_name.txt as changed,
older versions do.
What does "git --version" say on your Linux machine ?
However, if you want to fix it, you want to either end up with
A)
git ls-files --eol
i/lf w/lf attr/text=auto .gitattributes
i/lf w/crlf attr/text=auto file_name.txt
or
B)
git ls-files --eol
i/lf w/lf attr/text=auto .gitattributes
i/crlf w/crlf attr/-text file_name.txt
(The "attr/-text" means "don't change the line endings")
Both A) or B) will work, typically A) is preferred.
You should be able to achive A) :
git rm --cached file_name.txt && git add file_name.txt
rm 'file_name.txt'
warning: CRLF will be replaced by LF in file_name.txt.
The file will have its original line endings in your working directory.
git ls-files --eol
i/lf w/lf attr/text=auto .gitattributes
i/lf w/crlf attr/text=auto file_name.txt
[snip the rest]
next prev parent reply other threads:[~2017-11-15 17:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-14 12:31 Changing encoding of a file : What should happen to CRLF in file ? Ashish Negi
2017-11-14 15:20 ` Torsten Bögershausen
2017-11-14 16:13 ` Ashish Negi
2017-11-14 16:15 ` Ashish Negi
2017-11-14 17:09 ` Torsten Bögershausen
2017-11-15 8:11 ` Ashish Negi
2017-11-15 17:12 ` Torsten Bögershausen [this message]
2017-11-15 19:05 ` Ashish Negi
2017-11-16 16:15 ` Torsten Bögershausen
2017-11-23 16:31 ` Ashish Negi
2017-11-23 20:25 ` Torsten Bögershausen
2017-11-24 6:37 ` Ashish Negi
2017-11-14 16:45 ` Torsten Bögershausen
2017-11-24 16:14 ` [PATCH 1/1] convert: tighten the safe autocrlf handling tboegi
2017-11-24 17:24 ` Eric Sunshine
2017-11-24 18:59 ` Torsten Bögershausen
2017-11-25 3:16 ` Junio C Hamano
2017-11-26 12:20 ` [PATCH v2 " tboegi
2017-12-08 17:46 ` [PATCH v1 1/2] t0027: Don't use git commit <empty-pathspec> tboegi
2017-12-08 18:13 ` Junio C Hamano
2017-12-08 18:21 ` Junio C Hamano
2017-12-08 18:50 ` Torsten Bögershausen
2017-12-08 17:46 ` [PATCH v1 2/2] t0027: Adapt the new MIX tests to Windows tboegi
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171115171258.GA12963@tor.lan \
--to=tboegi@web.de \
--cc=ashishnegi33@gmail.com \
--cc=git@vger.kernel.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.