]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: abe43a5) | patch
Fix handling of core.eol=native and of crlf attribute 22/127322/5
authorThomas Wolf <thomas.wolf@paranor.ch>
Sun, 12 Aug 2018 12:27:21 +0000 (14:27 +0200)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Thu, 4 Oct 2018 23:17:41 +0000 (19:17 -0400)
commit569cf1856caf74274744619039fecc81f1856e62
tree85bd01044bd84aa6a3842817dd1f8d9d38ff6310tree | snapshot
parentabe43a584127b54c751aaa78e5a353a0eab7defbcommit | diff
Fix handling of core.eol=native and of crlf attribute

EolStreamTypeUtil didn't handle these correctly on Windows.

Add three new tests to verify that the crlf attribute is handled as
described at [1], and that core.eol=native produces the expected
line endings on check-out.

[1] https://git-scm.com/docs/gitattributes

Bug: 497290
Change-Id: Idd9b435e3256c1e3251cc7b966f2f0460e787f07
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CrLfNativeTest.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/util/io/EolStreamTypeUtil.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit