From 5099a42730ecb2a33152826a623d545f60fea77e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 14:10:02 +0100 Subject: 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 --- dgit.1 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'dgit.1') 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 in .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 -- cgit v1.2.3