From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 20 Aug 2018 00:59:08 +0000 (+0100)
Subject: dgit: quilt fixup: Maybe mention gitattributes
X-Git-Tag: archive/debian/6.7~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b8effc17a1aadcfdf3524157555a8656cc94369f

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 0d38ee7e..c17232fc 100644
--- 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 a2ca2dbd..e7521080 100755
--- 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?" ];