^M unchanged code

[xeross155]

Hey,

I keep having the following outputs in my diffs

-  PosSection = InStr(1, INIContents, "[" & Section & "]", vbTextCompare)
+  PosSection = InStr(1, INIContents, "[" & section & "]", vbTextCompare)^M

I haven't touched these lines but somehow they get the ^M at the end. I got told they are DOS line endings but my files (In this project) use them by default. Will these changes show up in my commits and how do I prevent em ?

Regards, Xeross

[DasBlub]

about file endings:

\\r (0x0D) is on Mac

\\n (0x0A) on Linux

\\r\\n (0x0D 0x0A) on Windows

the "^M", which you see, is the \\r which gets added on windows systems.

you should be able to use this config setting in .git/config to change the behavior (play around with it, i don't know if you'll have to set it to true or false):

[core]

autocrlf = false

[darkstalker]

make sure all your files are on unix line endings before commiting

[xeross155]

I chose the handle line endings myself option in the msysgit installation, so I'd expect it to ignore em. I'll check the config.

[VladimirMangos]

best way configure git always use Unix line ends at setup of git client and at commit own local chnages make sure use unix-line ends patches (and then use editores that preserve unix-lines while edit and save.

[freghar]

With msysgit using autocrlf=true, all CRLFs should be converted to LFs in the repo. Ie. you'll still see CRLFs in the working tree, but only LFs will be in the object database (and thus only LFs gets distributed).

(from my own little experience with msysgit on winXP, remote repo had all LFs, my working tree had all CRLFs, patch application may screw this a bit, though)

[xeross155]

autocrlf=false

[freghar]

autocrlf=false

That should turn off any CRLF/LF conversion, ie. you will have LFs even using msysgit. That's normally not a problem for anything except notepad.exe.

[xeross155]

Ye but why would it still see random changes in lines like the one in my first post.

[freghar]

clean and/or re-checkout your working tree;

git clean -fdx
git reset --hard

if that doesn't help, delete everything except .git/ and do

git checkout -qf HEAD