From 2707dcb8855fcfeae82dda55aecc2b8baf310977 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 16 Dec 2020 12:06:57 -0600 Subject: [PATCH] Rearrange .gitattribes and add a filter=output attribute to output files This change alone does nothing but helps to set up custom smudge/clean filters for all of our output files In reference to #11375 --- .gitattributes | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index 0a8c451a1a..fadb6b76bb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1,37 @@ -/.github/ export-ignore -/cmake/scripts/run_test.sh text eol=lf -/contrib/ci/ export-ignore -/tests/* export-ignore -/tests/CMakeLists.txt -export-ignore -/tests/quick_tests -export-ignore -/tests/run_test.cmake -export-ignore -/tests/tests.h -export-ignore -/tests/**/*output text eol=lf +# +# do not include the following files in tarballs created via git-export: +# + .clang-format export-ignore .clang-tidy export-ignore .codecov.yml export-ignore +/contrib/ci/ export-ignore .gitattributes export-ignore .gitignore export-ignore +Jenkinsfile export-ignore .mailmap export-ignore .travis.yml export-ignore -Jenkinsfile export-ignore + +/.github/ export-ignore + +/tests/* export-ignore +/tests/CMakeLists.txt -export-ignore +/tests/quick_tests -export-ignore +/tests/run_test.cmake -export-ignore +/tests/tests.h -export-ignore + +# +# MSVC compatiblity +# + +/cmake/scripts/run_test.sh text eol=lf +/tests/**/*.output* text eol=lf + +# +# Declare a number of filter attributes +# + +tests/**/*.output filter=test-output +bundled/**/* filter=bundled-files +bundled/CMakeLists.txt -filter=bundled-files +bundled/setup_bundled.cmake -filter=bundled-files -- 2.39.5