dgit: Defuse gitattributes in private working area, always

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7668c10c4461dc085734d1d82c91d06e7baf4c41..4c73fea9ade45e7282d5f4283538fb197a6574b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,52 @@
-dgit (3.3~) unstable; urgency=medium
+dgit (3.5~) unstable; urgency=medium
+
+  Bugfixes:
+  * Improve comment left in .git/info/attributes.
+  * Defuse gitattributes in private working area even if we don't do it in
+    the user's tree because config setup-gitattributes=false.
+
+ --
+
+dgit (3.4) unstable; urgency=low
+
+  Test suite:
+  * drs-push-rejects: Set origin's url to an ad-hoc expression
+    which produces the right ext:: rune, as dgit would.
+    Closes:#851580.
+  * Replace references to /home/ian in various worktrees with
+    references to /nonexistent, to catch inadvertant accesses.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 16 Jan 2017 17:27:35 +0000
+
+dgit (3.3) unstable; urgency=medium
+
+  Behavioural changes to work around gitattributes file transformations:
+  * Suppress file-transforming gitattributes in private work areas.
+  * Configure suppression in user's trees in dgit clone and setup-new-tree.
+  * Provide dgit setup-gitattributes to do this explicitly.
+  * Documentation.
 
   Bugfixes:
   * dgit: Remove a leftover debugging print.
   * dgit: Set default dsc import distro when there is no Dgit field.
+  * dgit: Set default dsc import distro when suppressing Dgit field.
+  * dgit: Option parsing: Fix undefined $suite in some import-dsc.
+    Closes:#851213.
 
   Packaging:
+  * Remove redundant use of List::Util qw(any).  Closes:#851280.
   * Remove redundant Recommends on libtext-iconv-perl.
 
   Test suite:
   * Move default dsc distro config setting to lib.  We need this
     for the .dscs we have in tests/pkg-srcs/.
+  * defdistro-import-dsc: Drop this test.
+  * protocol-compat: check that we use the right distro
+    information when importing.
+  * Internal change: fix handling of nonempty distro=
+  * gitattributes: New test for .gitattributes handling.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 16 Jan 2017 10:03:08 +0000
 
 dgit (3.2) unstable; urgency=medium