diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-10-17 19:49:15 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-10-18 09:42:55 +0200 |
| commit | 1d9a1215e8b0a2c9f3723d6f1fe5340943ed53a1 (patch) | |
| tree | e4bbbca70e3a366afba1afe310028d11061a1395 | |
| parent | 546e57f51b738c96ba7e1530107a10e80ecb3fe2 (diff) | |
| download | systemd-1d9a1215e8b0a2c9f3723d6f1fe5340943ed53a1.tar.gz | |
gitattributes: introduce and use "generated" attribute
I want to mark some files to be ignored for licensing purposes,
e.g. output from fuzzers and other samples. By using the gitattribute
machinery for this we don't need to design a custom protocol:
$ git check-attr generated test/test-sysusers/unhappy-*
test/test-sysusers/unhappy-1.expected-err: generated: set
test/test-sysusers/unhappy-1.input: generated: unspecified
test/test-sysusers/unhappy-2.expected-err: generated: set
test/test-sysusers/unhappy-2.input: generated: unspecified
test/test-sysusers/unhappy-3.expected-err: generated: set
test/test-sysusers/unhappy-3.input: generated: unspecified
| -rw-r--r-- | .gitattributes | 10 | ||||
| -rw-r--r-- | po/.gitattributes | 1 | ||||
| -rw-r--r-- | test/dmidecode-dumps/.gitattributes | 2 | ||||
| -rw-r--r-- | test/fuzz/.gitattributes | 1 | ||||
| -rw-r--r-- | test/journal-data/.gitattributes | 2 | ||||
| -rw-r--r-- | test/test-network-generator-conversion/.gitattributes | 1 | ||||
| -rw-r--r-- | test/test-network/.gitattributes | 1 | ||||
| -rw-r--r-- | test/test-resolve/.gitattributes | 2 | ||||
| -rw-r--r-- | test/test-sysusers/.gitattributes | 2 | ||||
| -rw-r--r-- | test/test-umount/.gitattributes | 1 |
10 files changed, 19 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 429748b0d4..c5b9d859dc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,11 @@ *.[ch] whitespace=tab-in-indent,trailing-space -*.gpg binary +*.gpg binary generated *.bmp binary + +# Mark files as "generated", i.e. no license applies to them. +# This includes output from programs, directive lists generated by grepping +# for all possibilities, samples from fuzzers, files from /proc, packet samples, +# and anything else where no copyright can be asserted. +# +# Use 'git check-attr generated -- <path>' to query the attribute. +[attr]generated diff --git a/po/.gitattributes b/po/.gitattributes new file mode 100644 index 0000000000..9418c2a217 --- /dev/null +++ b/po/.gitattributes @@ -0,0 +1 @@ +/LINGUAS generated diff --git a/test/dmidecode-dumps/.gitattributes b/test/dmidecode-dumps/.gitattributes index 64294bde82..a930f4fc7e 100644 --- a/test/dmidecode-dumps/.gitattributes +++ b/test/dmidecode-dumps/.gitattributes @@ -1 +1 @@ -/*.bin binary +/*.bin binary generated diff --git a/test/fuzz/.gitattributes b/test/fuzz/.gitattributes index 49f2902f0d..02dea65580 100644 --- a/test/fuzz/.gitattributes +++ b/test/fuzz/.gitattributes @@ -5,3 +5,4 @@ /fuzz-fido-id-desc/ binary /fuzz-lldp-rx/* binary /fuzz-ndisc-rs/* binary +/*/* generated diff --git a/test/journal-data/.gitattributes b/test/journal-data/.gitattributes index c04df17b59..483f6cdd60 100644 --- a/test/journal-data/.gitattributes +++ b/test/journal-data/.gitattributes @@ -1,2 +1,2 @@ # Journal data in export format -/*.txt binary +/*.txt binary generated diff --git a/test/test-network-generator-conversion/.gitattributes b/test/test-network-generator-conversion/.gitattributes new file mode 100644 index 0000000000..6df434f423 --- /dev/null +++ b/test/test-network-generator-conversion/.gitattributes @@ -0,0 +1 @@ +* generated diff --git a/test/test-network/.gitattributes b/test/test-network/.gitattributes new file mode 100644 index 0000000000..e99a2c3d05 --- /dev/null +++ b/test/test-network/.gitattributes @@ -0,0 +1 @@ +/conf/*.key generated diff --git a/test/test-resolve/.gitattributes b/test/test-resolve/.gitattributes index e4b1e295d6..6bebb3e11e 100644 --- a/test/test-resolve/.gitattributes +++ b/test/test-resolve/.gitattributes @@ -1 +1 @@ -/*.pkts binary +/*.pkts binary generated diff --git a/test/test-sysusers/.gitattributes b/test/test-sysusers/.gitattributes new file mode 100644 index 0000000000..f03f6c03ac --- /dev/null +++ b/test/test-sysusers/.gitattributes @@ -0,0 +1,2 @@ +/*.initial* generated +/*.expected* generated diff --git a/test/test-umount/.gitattributes b/test/test-umount/.gitattributes new file mode 100644 index 0000000000..6df434f423 --- /dev/null +++ b/test/test-umount/.gitattributes @@ -0,0 +1 @@ +* generated |