summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--dgit.12
-rw-r--r--dgit.710
3 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a370753..0d38ee7 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 4aea52f..16c0a01 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 27d0998..c150921 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