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

diff --git a/debian/changelog b/debian/changelog
index a0b54f9a44988c4289cfe1803573114518cf4ba2..aa06a7f8af89d0d1a775007fe9a4440166f4793b 100644 (file)
--- 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 df4ea91a0570c512a0f05ed6ddd3bd62aded6d57..66652983bd5e54e7cff238f6f226d4caf9548801 100755 (executable)
--- 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();