diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 0d38ee7..c17232f 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. -- @@ -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?" ]; |