From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 24 Aug 2013 17:01:30 +0000 (+0100)
Subject: In push, double-check the .changes against the changelog.
X-Git-Tag: debian/0.9~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=66f4ccc0e2c6667ce720cdd74806b0397f104154

In push, double-check the .changes against the changelog.
---

diff --git a/debian/changelog b/debian/changelog
index a0b54f9a..aa06a7f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dgit (0.9) unstable; urgency=low
 
   * New cleaning arrangements.
   * More comprehensive workaround for `3.0 (quilt)'.
+  * In push, double-check the .changes against the changelog.
 
  --
 
diff --git a/dgit b/dgit
index df4ea91a..66652983 100755
--- a/dgit
+++ b/dgit
@@ -849,6 +849,11 @@ sub dopush () {
 	    ($changesfile) = @cs;
 	}
     }
+    my $changes = parsecontrol($changesfile,$changesfile);
+    foreach my $field (qw(Source Distribution Version)) {
+	$changes->{$field} eq $clogp->{$field} or
+	    fail "changes field $field \`$changes->{$field}'"
+	        " does not match changelog \`$clogp->{$field}'";
     my $tag = debiantag($dversion);
     if (!check_for_git()) {
 	create_remote_git_repo();