dgit: Non-noop git fetch is not available with --dry-run, so fail

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b0fbb920243c3666542c04834bc69da786006626..2c305561fcd6b7c9ab76191c8d435d352881b7e5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,71 @@
-dgit (4.5~) unstable; urgency=medium
+dgit (5.2~) unstable; urgency=medium
+
+  * dgit(1): Mention under `dgit build' that it uses the network.
+
+  dgit:
+  * When all Debian changes vanish with single-debian-patch,
+    do not fail to commit the patch queue removal.  Closes:#877036.
+  * When build fails because the network is offline, mention
+    that this is because --since-version was not specified.
+    Closes:#883340.
+  * When quilt fixup fails because of discrepancies, print a
+    git diff rune which will show them.  Closes:#865446.
+  * When fetch or push wants git fetch (other than in a situation where it
+    happes to be a noop) but --dry-run was specified, fail with an
+    explanation, rather than looping with a false coplaint about git
+    fetch.  Closes:#871317.
 
-  Bugfixes:
-  * Fix the exit status of programs in dgit.deb, to avoid the
-    Perl misfeature which sometimes copies $! to the exit status.
+ --
+
+dgit (5.1) unstable; urgency=medium
+
+  dgit gitattributes handling:
+  * Squash the working-tree-encoding attribute too.
+  * Update an existing `dgit-defuse-attrs' macro in .git/info/attributes.
+  * Test the working-tree-encoding attribute squashing properly.
+    Closes:#901900.
+
+  git-debrebase fixes:
+  * new-upstream: fix (this time for sure) ff check handling
+    of multi-piece upstreams.
+  * Suppress gbp pq export output, except in case of error.
+    Closes:#901809.
+  * Manpages: Fix typos and etc.
+  * Fix a typo in the package description.
+
+  Test suite:
+  * Triger ci.debian.net autopkgtests on: gnupg diffutils patch.
+    (A dummy test is used to add to Testsuite-Triggers.)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 20 Jun 2018 23:20:57 +0100
+
+dgit (5.0) unstable; urgency=low
+
+  Major new facility:
+  * git-debrebase, a new git workflow tool, in its own package.
+  * dgit will now, when appropriate, check if it should call
+    git-debrebase.
+
+  [ Thanks to Sean Whitton for much useful input, and for
+     dgit-maint-debrebase(7). ]
+
+  dgit bugfixes:
+  * Fix the exit status of programs in dgit.deb, to avoid the Perl
+    misfeature which sometimes copies $! to the exit status.
   * When checking that the tree is clean, check the git index too.
   * In quilt_fixup_multipatch, work around git checkout paths
     not deleting files.  (Hypothetical bug AFAIAA.)
   * Respect --quilt=nofix even if single-debian-patch.
 
-  Minor fixes:
+  dgit minor fixes:
   * "confess" when we die due to a warning, rather than symply dieing.
 
   Internal changes:
   * Move $playground global to dgit.
   * Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm.
+  * Changes to support git-debrebase.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 18 Jun 2018 00:29:44 +0100
 
 dgit (4.4) unstable; urgency=high