From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?P=C4=93teris_K=C4=BCavi=C5=86=C5=A1?=
The msysgit = list msy...@googlegroups.com may be a better place for=20
this.
It is likely that you have a windows specific EOL conversion set within= =20
the wider config's (i.e. --system, --global). You may have=20
core.safecrlf set which does a round trip test so tests the conversion= =20
both ways.
The normal canonical line ending choice is LF in the repo.
I don't have a W7 install to compare against.
Philip
----- Original Message -----=20
From: "Stefan Norgren" <stefan....@gmail.com>
To: <g...@vger.kernel.org>
Sent: Wednesday, January 23, 2013 2:44 AM
Subject: Bug in EOL conversion?
> Hi,
>
> The EOL conversion does not behave as indicated by output message = from
> add and commit. Here is my test case executed on Windows 7 64 bit.
>
>
> $ git --version
> git version 1.8.0.msysgit.0
> $ which git
> /cygdrive/c/Program Files (x86)/Git/cmd/git
> $ git config --list
> core.symlinks=3Dfalse
> core.autocrlf=3Dtrue
> color.diff=3Dauto
> color.status=3Dauto
> color.branch=3Dauto
> color.interactive=3Dtrue
> pack.packsizelimit=3D2g
> help.format=3Dhtml
> http.sslcainfo=3D/bin/curl-ca-bundle.crt
> sendemail.smtpserver=3D/bin/msmtp.exe
> diff.astextplain.textconv=3Dastextplain
> rebase.autosquash=3Dtrue
> user.name=3DSte= fan
> user.email=3Dstefan@---.com
> core.repositoryformatversion=3D0
> core.filemode=3Dfalse
> core.bare=3Dfalse
> core.logallrefupdates=3Dtrue
> core.symlinks=3Dfalse
> core.ignorecase=3Dtrue
> core.hidedotfiles=3DdotGitOnly
>
> -- Note core.autocrlf=3Dtrue.
> -- Created withcrlf.txt with one character and one CRLF line feed.
> File size 3 bytes.
> -- Created withlf.txt with one character and one LF line feed. Fil= e
> size 2 bytes.
> -- Now let's init repository.
>
> $ git init
> Initialized empty Git repository in D:/Dev/workspaces/gittest/.git/
> $ ls -la
> total 10
> d---------+ 1 Stefan None 0 Jan 23 02:12 .
> d---------+ 1 Stefan None 0 Jan 23 02:10 ..
> d---------+ 1 Stefan None 0 Jan 23 02:13 .git
> ----------+ 1 Stefan None 3 Jan 23 01:55 withcrlf.txt
> ----------+ 1 Stefan None 2 Jan 23 01:55 withlf.txt
>
> -- Note no .gitattributes file that will affect EOL conversion.
>
> $ ls -la .git/info/
> total 5
> d---------+ 1 Stefan None 0 Jan 23 02:12 .
> d---------+ 1 Stefan None 0 Jan 23 02:13 ..
> ----------+ 1 Stefan None 240 Jan 23 02:12 exclude
>
> -- Note no attribute file in .git/info/ that will affect EOL=20
> conversion.
>
> $ git add *
> warning: LF will be replaced by CRLF in withlf.txt.
> The file will have its original line endings in your working=20
> directory.
> $ git commit -m 'Testing EOL'
> [master (root-commit) 9a0b2f5] Testing EOL
> 2 files changed, 2 insertions(+)
> create mode 100644 withcrlf.txt
> create mode 100644 withlf.txt
> warning: LF will be replaced by CRLF in withlf.txt.
> The file will have its original line endings in your working=20
> directory.
> $ ls -la
> total 10
> d---------+ 1 Stefan None 0 Jan 23 02:12 .
> d---------+ 1 Stefan None 0 Jan 23 02:10 ..
> d---------+ 1 Stefan None 0 Jan 23 02:22 .git
> ----------+ 1 Stefan None 3 Jan 23 01:55 withcrlf.txt
> ----------+ 1 Stefan None 2 Jan 23 01:55 withlf.txt
>
> -- So no changes (see file size) to files in working directory. Th= is
> is expected and according to output warning from add and commit.
>
> -- Now lets look in the repository
>
> $ git ls-tree -l HEAD withcrlf.txt
> 100644 blob d00491fd7e5bb6fa28c517a0bb32b8b506539d4d &= nbsp; 2=20
> withcrlf.txt
> $ git ls-tree -l HEAD withlf.txt
> 100644 blob d00491fd7e5bb6fa28c517a0bb32b8b506539d4d &= nbsp; 2=20
> withlf.txt
>
> -- Note that size of withlf.txt is 2 in repository indicating that= LF
> was not replaced by CRLF in withlf.txt as indicated in output from= add
> and commit. Also note that size of withcrlf.txt is also 2 in
> repository so it looks like CRLF was replaced by LF in withcrlf.tx= t.
> To verify I will delete the files from working directory, turn off= EOL
> conversion, checkout files and look at file endings in the working
> directory.
>
> $ rm with*
> $ ls -la
> total 8
> d---------+ 1 Stefan None 0 Jan 23 02:31 .
> d---------+ 1 Stefan None 0 Jan 23 02:10 ..
> d---------+ 1 Stefan None 0 Jan 23 02:22 .git
> $ git status
> # On branch master
> # Changes not staged for commit:
> # (use "git add/rm <file>..." to update what will be = committed)
> # (use "git checkout -- <file>..." to discard changes= in working=20
> directory)
> #
> # deleted: withcrlf.txt
> # deleted: withlf.txt
> #
> no changes added to commit (use "git add" and/or "git commit -a")
> $ git config --global core.autocrlf false
> $ git config --global core.autocrlf
> false
> $ git checkout -- with*
> $ ls -la
> total 10
> d---------+ 1 Stefan None 0 Jan 23 02:38 .
> d---------+ 1 Stefan None 0 Jan 23 02:10 ..
> d---------+ 1 Stefan None 0 Jan 23 02:38 .git
> ----------+ 1 Stefan None 2 Jan 23 02:38 withcrlf.txt
> ----------+ 1 Stefan None 2 Jan 23 02:38 withlf.txt
>
> -- Both files in working directory files now have LF line endings
> confirming that files in repository have LF file endings. Either t= he
> output message of add and commit is wrong or the behavior of the E= OL
> conversion is wrong... or... have I missed something...?
>
> /Stefan
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majo...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-i= nfo.html
>
>
> -----
> No virus found in this message.
> Checked by AVG - = www.avg.com
> Version: 2013.0.2890 / Virus Database: 2639/6050 - Release Date:= =20
> 01/22/13
>=20