split brain cache: Add a dummy ref update when necessary

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b8811e0e554cb0265f761dd4b5a324b942629b78..08b3e32364e685173de9f63acb7699bc52021ee7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+dgit (2.4~) unstable; urgency=low
+
+  * dgit gbp-build: No longer invent a --git-debian-branch option.
+    Usually the user is a maintainer using split brain, and we should rely
+    on their own gbp configuration to specify the right check.
+    Closes:#841100.
+  * split brain cache: Fix a wrong implicit reference to $_.
+    Closes:#841383.
+  * split brain cache: Make sure to write reflog entries for cache updates
+    even if the eventual tree (and therefore commit) is the same.
+    Otherwise, after updating dgit, the cache might have the right answer
+    but not be refreshed even by a build.
+
+ --
+
+dgit (2.3) unstable; urgency=low
+
+  * With --overwrite, do not check all sorts of tags (which may
+    not exist, or might contain wrong things).  Closes:#841101.
+  * When generating pseudomerge in quilt split brain mode due to
+    --overwrite, actually include the version number in the commit
+    message.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 18 Oct 2016 01:58:05 +0100
+
 dgit (2.2) unstable; urgency=low
 
   * Fix config relating to Debian to actually make split brain mode