From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Graham Sanderson <graham.sanderson@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: EOL strangeness
Date: Thu, 20 Jan 2011 09:54:43 +0100 [thread overview]
Message-ID: <4D37F853.1020805@lsrfire.ath.cx> (raw)
In-Reply-To: <AANLkTiknxMh_OophKWsqkYO2C+PsfF0ZnNXKLbheM4wF@mail.gmail.com>
Am 17.01.2011 20:56, schrieb Graham Sanderson:
> Apologies if someone has answered this before:
>
> So we have moved some big teams over to git (awesome thx), and have
> been using the msysgit default core.autocrlf=true on Windows, and
> making sure text files are LF on other platforms
>
> However we do continue to have a few problems with people storing CRLF
> in the repository (partly because of lack of understanding, and partly
> it seems because of eGit on windows which ignores core.autocrlf).
>
> Anyway, this much is all fine, and we can fix; what I don't understand
> is why for files stored as CRLF in the repository it seems
> indeterminate when or if they show up locally modified (on my window
> box with core.autocrlf = true) when I pull them from the repository. I
> assume the idea is that that they "would be" modified if I were to
> check them in, since they would be converted to LF, however this only
> happens sometimes and for a seemingly random subset of the files
> stored incorrectly.
>
> It also seems to depend on the state of the local index, as recreating
> the local index often changes the set of files that are displayed this
> way (even without any changes to the files), and it also seems to be
> different on different machines (perhaps based on when they happened
> to pull code).
>
> If anyone can give me a quick mental picture of how this is supposed
> to work (i.e. at what time the eol conversions are considered) then
> that'd be great... otherwise I guess I'll go dig in the code.
Perhaps this recent thread is of interest to you, even though it's on a
slightly different topic and inconclusive:
http://thread.gmane.org/gmane.comp.version-control.git/163794
It would be nice to have the expectations in your case codified in a
test script -- based on the documentation, if possible.
René
next prev parent reply other threads:[~2011-01-20 8:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-17 19:56 EOL strangeness Graham Sanderson
2011-01-20 8:54 ` René Scharfe [this message]
2011-01-20 16:29 ` Graham Sanderson
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=4D37F853.1020805@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=git@vger.kernel.org \
--cc=graham.sanderson@gmail.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.
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.