summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/.settings
diff options
context:
space:
mode:
authorIvan Motsch <ivan.motsch@bsiag.com>2016-02-25 15:39:41 +0100
committerChristian Halstrick <christian.halstrick@sap.com>2016-03-07 17:24:32 +0100
commitb811e4399ea578a07595bac790ad619b9fcb1300 (patch)
treef250d10e959185a6162f5748a5afcd7fe06ad239 /org.eclipse.jgit/.settings
parent846ef78a02edceb99940d7aa92dcd2462a85c602 (diff)
downloadjgit-b811e4399ea578a07595bac790ad619b9fcb1300.tar.gz
jgit-b811e4399ea578a07595bac790ad619b9fcb1300.zip
Add EOL stream type detection to TreeWalk
TreeWalk provides the new method getEolStreamType. This new method can be used with EolStreamTypeUtil in order to create a wrapped InputStream or OutputStream when reading / writing files. The implementation implements support for the git configuration options core.crlf, core.eol and the .gitattributes "text", "eol" and "binary" CQ: 10896 Bug: 486563 Change-Id: Ie4f6367afc2a6aec1de56faf95120fff0339a358 Signed-off-by: Ivan Motsch <ivan.motsch@bsiag.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r--org.eclipse.jgit/.settings/.api_filters21
1 files changed, 21 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index a5000dd6bd..c0dbc779f3 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -16,4 +16,25 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/jgit/dircache/DirCacheCheckout.java" type="org.eclipse.jgit.dircache.DirCacheCheckout">
+ <filter comment="add eol stream type conversion" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.dircache.DirCacheCheckout"/>
+ <message_argument value="checkoutEntry(Repository, DirCacheEntry, ObjectReader, boolean)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="add eol stream type conversion" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.dircache.DirCacheCheckout"/>
+ <message_argument value="checkoutEntry(Repository, DirCacheEntry, ObjectReader, boolean, String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="add eol stream type conversion" id="1141899266">
+ <message_arguments>
+ <message_argument value="4.2"/>
+ <message_argument value="4.3"/>
+ <message_argument value="checkoutEntry(Repository, DirCacheEntry, ObjectReader, boolean, DirCacheCheckout.CheckoutMetadata)"/>
+ </message_arguments>
+ </filter>
+ </resource>
</component>