git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: "Junio C Hamano" <gitster@pobox.com>,
	"Torsten Bögershausen" <tboegi@web.de>
Cc: Yue Lin Ho <yuelinho777@gmail.com>,
	git@vger.kernel.org, msysGit <msysgit@googlegroups.com>
Subject: Re: [msysGit] Re: The different EOL behavior between libgit2-based software and official Git
Date: Sun, 22 Jun 2014 08:46:57 +0200	[thread overview]
Message-ID: <53A67BE1.4060903@web.de> (raw)
In-Reply-To: <xmqqmwd7ee2j.fsf@gitster.dls.corp.google.com>

On 2014-06-20 18.33, Junio C Hamano wrote:
> Torsten Bögershausen <tboegi@web.de> writes:
> 
> tb@Linux:~/EOL_Test/TestAutoCrlf$ t=LF.txt  &&  rm -f $t &&  git -c core.eol=CRLF checkout $t  && od -c  $t
> 0000000   L   i   n   e       1  \n   l   i   n   e       (   2   )  \n
> 0000020   l   i   n   e       3   .  \n   t   h   i   s       i   s    
> 0000040   l   i   n   e       4  \n   l       i       n       e       N
> 0000060   o   .       5  \n   L   i   n   e       N   u   m   b   e   r
> 0000100       6  \n  \n
> 
> In Documentation/config.txt, we find:
> 
>     core.eol::
>             Sets the line ending type to use in the working directory for
>             files that have the `text` property set.  Alternatives are ...
> 
> Does that file $t in your practice "have the `text` property set"?
> 
No, it hadn't, under my Linux box.
(And I had a .gittatributes file on the Mac OS box, which I forgot about.
I am really sorry for the confusion and saying that Git behaves different under Linux and Mac OS).

You are pointing into the right direction:
Files with mixed LF CRLF in the repo are not changed by Git, when the checkout out
or checked in, unless the .gitattributes say that the file is text.

And libgit2 should do the same.


However, I was confused by this
https://www.kernel.org/pub/software/scm/git/docs/git-config.html
(My comments inline with ##)
-----------------------
core.autocrlf

    Setting this variable to "true" is almost the same as setting the text attribute to "auto" on all files except that text files are not guaranteed to be normalized: files that contain CRLF in the repository will not be touched. 
## And is this line still valid:
Use this setting if you want to have CRLF line endings in your working directory even though the repository does not have normalized line endings. 

## In 2010 the "the new safer autocrlf handling" was introduced,
## and it looks as if commits fd6cce9e and c4805393 are involved here.
## When the file in the repo has only LF, it will have CRLF in the work tree
## When the file in the repo has mixed LF and CRLF, it will not be changed in the work tree
## and will have mixed line endings in the work tree
## When the file in the repo has only CRLF, it will not be changed in the work tree
## and will have CRLF in the work tree as well as in the repo.

##Should this line simply be dropped in the documentation ?

  reply	other threads:[~2014-06-22  6:47 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-19  2:59 The different EOL behavior between libgit2-based software and official Git Yue Lin Ho
2014-06-19  6:39 ` Torsten Bögershausen
2014-06-19  7:25   ` Yue Lin Ho
2014-06-20  6:56   ` Torsten Bögershausen
2014-06-20  8:30     ` Yue Lin Ho
2014-06-20 10:33       ` [msysGit] " Torsten Bögershausen
2014-06-20 16:33         ` Junio C Hamano
2014-06-22  6:46           ` Torsten Bögershausen [this message]
2014-06-23 17:29             ` Junio C Hamano
2014-06-20  8:44     ` Yue Lin Ho

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=53A67BE1.4060903@web.de \
    --to=tboegi@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=msysgit@googlegroups.com \
    --cc=yuelinho777@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 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 NNTP newsgroup(s).