[jmeter] branch master updated: Improve gitignore and gitattributes

[vl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new b479798  Improve gitignore and gitattributes
b479798 is described below

commit b4797982a1567a5db72e42305dca95e4a86a4119
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri Jul 19 16:03:06 2019 +0300

    Improve gitignore and gitattributes
---
 .gitattributes               | 10 +++++++++-
 .gitignore                   |  9 +++++++++
 bin/testfiles/.gitattributes |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 8204e5e..bfd8e48 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,7 +8,15 @@
 *.sql    text
 *.q      text
 
-*.sh     text eol=lf
+# Note: executable is a non-standard attribute, and it is used by the release plugin
+*.sh     text eol=lf executable
+*.cgi    text eol=lf executable
 
 *.bat    text eol=crlf
 *.cmd    text eol=crlf
+
+# Blow files don't have extension, so we mention them explicitly
+/gradlew           text eol=lf executable
+/bin/jmeter        text eol=lf executable
+/bin/jmeter-server text eol=lf executable
+/bin/mirror-server text eol=lf executable
diff --git a/.gitignore b/.gitignore
index 943b419..456b228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,16 @@
 .pmd
 .project
 .settings
+
+# bin/ folder is used to launch JMeter, so we ignore certain files there
 /bin/ApacheJMeter.jar
+# Below are the results of "batch test" execution
+/bin/*.csv
+/bin/*.jmx
+/bin/*.jtl
+/bin/*.xml
+# We need log4j2.xml even though we want to exclude xml created by batch tests
+!/bin/log4j2.xml
 
 build-local.properties
 jmeter-fb.*
diff --git a/bin/testfiles/.gitattributes b/bin/testfiles/.gitattributes
index ca1425c..931ac18 100644
--- a/bin/testfiles/.gitattributes
+++ b/bin/testfiles/.gitattributes
@@ -1,2 +1,2 @@
 # JMeter hard-codes resource sizes, so we should stick to single end-of-line setting
-HTMLParserTestFile_2.html        text=auto eol=crlf
+/HTMLParserTestFile_2.html        text=auto eol=crlf