path: root/Debian/
diff options
authorIan Jackson <>2018-06-20 14:10:02 +0100
committerIan Jackson <>2018-06-20 14:29:38 +0100
commit5099a42730ecb2a33152826a623d545f60fea77e (patch)
tree03d2c10435508ad50d8f0bc1750635582392ac33 /Debian/
parent1cf29315dda6f4d7aa1ae6f9b5800b35173040c6 (diff)
dgit: gitattributes: Defuse working-tree-encoding
* Add -working-tree-encoding to $negate_harmful_gitattrs. * Add new arrangements for updating an existing dgit-defuse-attrs macro definition: - is_gitattrs: say whether the macro is up to date - setup_gitattrs: update an existing out-of-date macro - minor message changes - document the new behaviour One consequence is that we have had to breach the promise about how to stop future dgit setup-new-tree runs messing with this: it is now necessary to disapply the macro, rather than redefine it. Closes:#901900. Signed-off-by: Ian Jackson <>
Diffstat (limited to 'Debian/')
1 files changed, 3 insertions, 1 deletions
diff --git a/Debian/ b/Debian/
index 960f505..aec5a23 100644
--- a/Debian/
+++ b/Debian/
@@ -101,7 +101,9 @@ sub NOCOMMITCHECK () { return 0x8; }
our $debugprefix;
our $debuglevel = 0;
-our $negate_harmful_gitattrs = "-text -eol -crlf -ident -filter";
+our $negate_harmful_gitattrs =
+ "-text -eol -crlf -ident -filter -working-tree-encoding";
+ # ^ when updating this, alter the regexp in dgit:is_gitattrs_setup
our $forkcheck_mainprocess;