dgit: quilt fixup: Maybe mention gitattributes

These are a potential cause of quilt linearisation failure.

Closes:#906199.

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

diff --git a/debian/changelog b/debian/changelog
index 0d38ee7e9054c1453f9b9dc0b797df4099307730..c17232fcd5b53c6966d37c23b683939bdf546074 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ dgit (6.7~) unstable; urgency=medium
     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.
+  * dgit: Mention gitattributes as a potential problem in quilt
+    linearisation failure, when appropriate.  Closes:#906199.
 
  --
 

diff --git a/dgit b/dgit
index a2ca2dbd6056082d3fb5d2762aa5698438ac7a0c..e75210805370d71b799df411fbad4ed2ead8c2b3 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5930,6 +5930,11 @@ END
     }
     push @failsuggestion, [ 'quilt-mode',
  "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
+
+    push @failsuggestion, [ 'gitattrs',
+ "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)." ]
+       if stat_exists '.gitattributes';
+
     push @failsuggestion, [ 'origs',
  "Maybe orig tarball(s) are not identical to git representation?" ];