Page 1 of 1

crlf troubles on linux

Posted: Thu Aug 11, 2016 12:11 pm
by rguillon
I just cloned a fresh copy of micropython and gets a lots of files marked as modified in the stmhal and lib directories, all are CRLF inconsistency.

Do I need to configure git? I've tried to play with "autocrlf" in my .gitconfig but it's not helping.


edit:

I had an old git (v1.7.10.4) who did not handle the .gitattribute file, updating git solved my problem.

Re: crlf troubles on linux

Posted: Sat Oct 08, 2016 10:02 am
by sledmotley424
Facing the same issue. Any help?

Re: crlf troubles on linux

Posted: Sat Oct 08, 2016 5:34 pm
by dhylands
I'm running ubuntu 16.04 and I just checked out a fresh tree and I'm not seeing any issues.

I'm running git 2.7.4. My ~/.gitconfig looks like:

Code: Select all

[color]
	diff = auto
	status = auto
	branch = auto
	ui = auto
[user]
	name = Dave Hylands
	email = dhylands@gmail.com
[core]
	editor = vi
	pager = less -FRXS
[alias]
	status-report = !sh -c \"git log --pretty='%C(yellow)%h%Creset %cn %Cgreen%cr%Creset %s'\" | grep Hylands
	summary-report = !sh -c \"git log --pretty='%C(yellow)%h%Creset %cn %Cgreen%cr%Creset %s'\"
[branch]
	autosetuprebase = always
[merge]
	tool = meld
[diff]
	guitool = meld
	tool = meld
[push]
	default = simple