From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 20 Aug 2018 00:58:06 +0000 (+0100)
Subject: dgit(1), dgit(7): Document that we do not suppress export attributes
X-Git-Tag: archive/debian/6.7~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a88577467219f6813799d41cc80ae32c176cd8a5

dgit(1), dgit(7): Document that we do not suppress export attributes

Ie, ones which affect git-archive.  This is related to #906199.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index a370753d..0d38ee7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ dgit (6.7~) unstable; urgency=medium
     Closes:906196.
   * dgit: Do not suggest --quilt modes if quilt fixup "stopped at"
     a commit made by git-debrebase.  Closes:#906197.
+  * dgit(1), dgit(7): Document that we do not suppress attributes
+    which affect git-archive.  This is related to #906199.
 
  --
 
diff --git a/dgit.1 b/dgit.1
index 4aea52f0..16c0a011 100644
--- a/dgit.1
+++ b/dgit.1
@@ -346,6 +346,8 @@ For why, see
 .B GITATTRIBUTES
 in
 .BR dgit(7) .
+Note that only attributes affecting the working tree are suppressed.
+git-archive may remain exciting.
 
 If there is an existing macro attribute line
 .B [attr]dgit-defuse-attrs
diff --git a/dgit.7 b/dgit.7
index 27d0998d..c1509212 100644
--- a/dgit.7
+++ b/dgit.7
@@ -249,6 +249,16 @@ See
 and
 .B dgit setup-gitattributes
 in dgit(1).
+
+Note that dgit does not disable gitattributes
+unless they would actually interfere with your work on dgit branches.
+In particular, gitattributes which affect
+.B git archive
+are not disabled,
+so .origs you generate by hand can be wrong.
+You should consider using
+.B git-deborig (1)
+which gets this right, suppressing the attributes.
 .SH PACKAGE SOURCE FORMATS
 If you are not the maintainer, you do not need to worry about the
 source format of the package.  You can just make changes as you like