Wireshark mailing list archives

Re: Git and line endings


From: Graham Bloice <graham.bloice () trihedral com>
Date: Tue, 4 Feb 2014 10:09:34 +0000

On 3 February 2014 22:50, Pascal Quantin <pascal.quantin () gmail com> wrote:

Hi all,

with subversion we were using the native eol-style property. Now that we
moved to git, would it make sense to commit a .gitattributes file with
text=auto to avoid any issue between Linux and Windows development boxes?
I faced tonight an issue with asn2wrs.py that generated the ASN.1
dissector with CRLF line endings on my Windows machine (due to the use of
Python open() function) while my checkout had LF line endings, leading to
completely different files from git point of view.


There seems to be a lot of confusion around this aspect, possibly because
Windows is usually a second class citizen in the git world.

Some other useful links:
http://stackoverflow.com/questions/170961/whats-the-best-crlf-handling-strategy-with-git
https://help.github.com/articles/dealing-with-line-endings
http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line

Even when the .gitattributes is correctly set it seems that someone will
have to re-normalise the repo (as in the GitHub article).
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe

Current thread: