commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jason Pyeron" <jpye...@pdinc.us>
Subject [commons-io][IO-516] .gitattributes - minor snafu
Date Sun, 09 Oct 2016 13:00:33 GMT
A few days ago a .gitattributes was applied, but it is causing some wierdnesss in the resources
and a few other files.

The following files are "modified" on clone:

src/main/java/org/apache/commons/io/serialization/package.html
src/site/xdoc/upgradeto2_3.xml
src/test/resources/org/apache/commons/io/FileUtilsTestDataCRLF.dat
src/test/resources/test-file-gbk.bin
src/test/resources/test-file-iso8859-1-shortlines-win-linebr.bin
src/test/resources/test-file-utf8-win-linebr.bin
src/test/resources/test-file-windows-31j.bin
src/test/resources/test-file-x-windows-949.bin
src/test/resources/test-file-x-windows-950.bin

Now the html and xml can have their line ending cleaned up and committed.

But the resources directory needs its own .gitattributes

src/test/resources/.gitattributes:
*        -text

-Jason
[CLA on file] pull request on github...

>From the log:

commit c5f2e40e7a8234fe48e08d451d3152ba58a03ac6
Author: Gary Gregory <ggregory@apache.org>
Date:   Tue Sep 27 19:09:52 2016 -0700

    [IO-515] Allow Specifying Initial Buffer Size of
    DeferredFileOutputStream. Redo submitted patch.

commit 9e2b2c09732ca596331f7ca34ba4e0f03d70093d
Author: Kristian Rosenvold <krosenvold@apache.org>
Date:   Thu Sep 22 09:39:25 2016 +0200

    Fixed files in repo with incorrect line endings

commit 941a9a6c2735543607e55fa0d54546b9b229c8e8
Author: Kristian Rosenvold <krosenvold@apache.org>
Date:   Wed Sep 21 12:33:20 2016 +0200

    Added .gitattributes to avoid client config issues once and for all

commit 822bd135f3a54b8fbeb23c313535b13c18198c3a
Author: Gary Gregory <ggregory@apache.org>
Date:   Mon Sep 19 22:40:29 2016 -0700

    Remove redundant type arguments.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message