chiark / gitweb /
pseudomerge: When generating pseudomerge in quilt split brain mode due to --overwrite...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Oct 2016 00:33:12 +0000 (01:33 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Oct 2016 00:44:23 +0000 (01:44 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/changelog
dgit

index f88bc38..88ec5bb 100644 (file)
@@ -1,6 +1,8 @@
 dgit (2.3~) unstable; urgency=medium
 
-  * 
+  * When generating pseudomerge in quilt split brain mode due to
+    --overwrite, actually include the version number in the commit
+    message.
 
  --
 
diff --git a/dgit b/dgit
index 3b847d7..bc4d7c3 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2912,7 +2912,7 @@ sub splitbrain_pseudomerge ($$$$) {
        $clogp, $dgitview, $archive_hash, $i_arch_v,
        "dgit --quilt=$quilt_mode",
        (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
-Declare fast forward from $overwrite_version
+Declare fast forward from $i_arch_v->[0]
 END_OVERWR
 Make fast forward from $i_arch_v->[0]
 END_MAKEFF