Make merge_copyrights ignore hidden files

(cherry picked from commit 6d46082d82408845dcbb185f702d57d04d3ccf3c)

diff --git a/util/copyrights b/util/copyrights
index 70bb5eb1b16e20cd9451c58bb7233769e8b1e90d..b1933387295d14cbf922b8d12918d364b0e7ab85 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,7 +1,3 @@
-./.dir-locals.el                               X       2019,2020
-./.gitattributes                               X       2015,2017,2018,2019,2020
-./.gitlab-ci.yml                               X       2018,2019,2020
-./.pylintrc                                    X       2020
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
 ./CONTRIBUTING                                 X       2018,2019,2020
 ./CONTRIBUTING.md                              MKD     2018,2019,2020
@@ -869,7 +865,6 @@
 ./bin/tests/system/checkzone/clean.sh          SH      2011,2012,2013,2014,2016,2018,2019,2020
 ./bin/tests/system/checkzone/setup.sh          SH      2014,2016,2018,2019,2020
 ./bin/tests/system/checkzone/tests.sh          SH      2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
-./bin/tests/system/checkzone/zones/.gitattributes      X       2015,2018,2019,2020
 ./bin/tests/system/checkzone/zones/bad-badclass.raw    X       2015,2018,2019,2020
 ./bin/tests/system/checkzone/zones/bad-caa-rr.db       ZONE    2015,2016,2018,2019,2020
 ./bin/tests/system/checkzone/zones/bad-cdnskey.db      ZONE    2019,2020

diff --git a/util/merge_copyrights b/util/merge_copyrights
index bb763aef21463952ee2f6710115b2a8e7571054b..4da3c0989f11bbb478c0b5a4d2d0e2205b4df2d4 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -31,10 +31,7 @@ open(CHANGES, "git ls-files | sed 's;^;./;' | sort |") || die "git ls-files: $!"
 while (<CHANGES>) {
     chomp;
 
-    next if (m%/\.\# |         # CVS old conflict file
-              /CVS/ |          # CVS directory
-              /\.git/ |                # git directory
-              /\.gitignore |   # .gitignore files
+    next if (m%/\. |         # just ignore all hidden files
               util/newcopyrights | # our output
               \.bak$ |         # created by update_copyrights
               /(dnssafe|openssl)/.*\.[ch]$ |   # imported