path: root/dgit.1
diff options
authorIan Jackson <>2018-06-20 14:10:02 +0100
committerIan Jackson <>2018-06-20 14:29:38 +0100
commit5099a42730ecb2a33152826a623d545f60fea77e (patch)
tree03d2c10435508ad50d8f0bc1750635582392ac33 /dgit.1
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 'dgit.1')
1 files changed, 10 insertions, 1 deletions
diff --git a/dgit.1 b/dgit.1
index 56ba402..c5d7688 100644
--- a/dgit.1
+++ b/dgit.1
@@ -268,10 +268,19 @@ For why, see
.BR dgit(7) .
+If there is an existing macro attribute line
+.B [attr]dgit-defuse-attrs
+in .git/info/attributes,
+but it is insufficient,
+because it was made by an earlier version of dgit
+and git has since introduced new transforming attributes,
+modifies the macro to disable the newer transformations.
(If there is already a macro attribute line
.B [attr]dgit-defuse-attrs
in .git/info/attributes
-(whatever its effects),
+which does what dgit requires
+(whatever files it effects),
this operation does nothing further.
This fact can be used to defeat or partially defeat
dgit setup-gitattributes