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 a370753de38f8ce247d6cf42eb2dfa3d299ebfa8..0d38ee7e9054c1453f9b9dc0b797df4099307730 100644 (file)
--- 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.
     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 4aea52f0b55562d24358c9fab7a9760c83e5366b..16c0a0110ab9e6f22a711f9c42790c712c4d7804 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -346,6 +346,8 @@ For why, see
 .B GITATTRIBUTES
 in
 .BR dgit(7) .
 .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
 
 If there is an existing macro attribute line
 .B [attr]dgit-defuse-attrs

diff --git a/dgit.7 b/dgit.7
index 27d0998d8ef5e3bf0d820b4204d94de917c0aea0..c15092129b3f0db001e0504ee423709cf73904ea 100644 (file)
--- a/dgit.7
+++ b/dgit.7
@@ -249,6 +249,16 @@ See
 and
 .B dgit setup-gitattributes
 in dgit(1).
 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
 .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