Author: kkolinko
Date: Sun May 6 21:22:48 2018
New Revision: 1831060
URL: http://svn.apache.org/viewvc?rev=1831060&view=rev
Log:
Add a .gitattributes file to make sure that Git handles test data files for bug
52121 as binary.
Added:
tomcat/tc7.0.x/trunk/.gitattributes (with props)
Modified:
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Added: tomcat/tc7.0.x/trunk/.gitattributes
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/.gitattributes?rev=1831060&view=auto
==============================================================================
--- tomcat/tc7.0.x/trunk/.gitattributes (added)
+++ tomcat/tc7.0.x/trunk/.gitattributes Sun May 6 21:22:48 2018
@@ -0,0 +1,21 @@
+# -----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
+
+# bug52121-part1, bug52121-part2 files are test data for a hard
+# to reproduce testcase and should be treated as binary.
+test/org/apache/coyote/http11/filters/bug52121-part1 binary
+test/org/apache/coyote/http11/filters/bug52121-part2 binary
Propchange: tomcat/tc7.0.x/trunk/.gitattributes
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1831060&r1=1831059&r2=1831060&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sun May 6 21:22:48 2018
@@ -183,9 +183,10 @@
<property name="test.jvmarg.egd" value="" />
<!-- Include .gitignore in src distributions. -->
- <!-- .git and .gitignore are in defaultexcludes since Ant 1.8.2 -->
+ <!-- .git, .gitattributes and .gitignore are in defaultexcludes since Ant
1.8.2 -->
<defaultexcludes add="**/.git" />
<defaultexcludes add="**/.git/**" />
+ <defaultexcludes remove="**/.gitattributes" />
<defaultexcludes remove="**/.gitignore" />
<!--<defaultexcludes echo="true" />-->
@@ -244,6 +245,7 @@
<include name="**/javax.servlet.ServletContainerInitializer"/>
<include name="**/javax.websocket.ContainerProvider"/>
<include
name="**/javax.websocket.server.ServerEndpointConfig$Configurator"/>
+ <include name="**/.gitattributes"/>
<include name="**/.gitignore"/>
<include name="**/*.classpath"/>
<include name="**/*.css"/>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1831060&r1=1831059&r2=1831060&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun May 6 21:22:48 2018
@@ -100,6 +100,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Add a <code>.gitattributes</code> file to make sure that Git
+ handles test data files for bug <bug>52121</bug> as binary. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.87 (violetagg)" rtext="not released">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
