Skip to content

Commit 14ce7b1

Browse files
update .gitattributes to take care of CRLF before commit
1 parent 89e295b commit 14ce7b1

3 files changed

Lines changed: 10 additions & 0 deletions

File tree

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@ c08cb797fd1a2cb45bc0b9e4522cabb15d1f36bd
4141
b8fe34b73c9df9330c1608229b2f8cddc6e275b4
4242
#4885
4343
263bbe65047e535fbad981852ad9c7327826f93d
44+
#5446
45+
89e295b3fb76ddaa05327162fd0dd2f6b0562b9a

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Ensure all line endings for text files are LF (UNIX, Python default) and not CRLF (Windows/DOS default)
2+
* text=auto eol=lf
3+
4+
# Data files from testsuite/MDAnalysisTests/data/windows/* need to end with CRLF for Windows testing
5+
testsuite/MDAnalysisTests/data/windows/* text=auto eol=crlf

package/CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ Fixes
6868
to version 5.1.0 (Issue #5145, PR #5146)
6969
* Fixes incorrect assignment of secondary structure to proline residues in
7070
DSSP by porting upstream PyDSSP 0.9.1 fix (Issue #4913)
71+
* Added `.gitattributes` to enforce LF (\n) as line endings and renormalized
72+
existing files to conform (Issue #5315, PR #5446)
73+
7174

7275
Enhancements
7376
* Added ASV benchmark for PDB trajectory reading (PR #5394)

0 commit comments

Comments
 (0)