+sub rewrite_commit_adddummy ($$$) {
+ my ($ref, $veryold, $old) = @_;
+
+ die "$bare ?" unless $bare eq 'true';
+
+ my $td = 'dgit-broken-fixup.tmp';
+ runcmd qw(rm -rf), $td;
+ mkdir $td, 0700 or die "$td $!";
+ chdir $td or die $!;
+ runcmd qw(git init -q);
+ runcmd qw(git config gc.auto 0);
+ runcmd qw(rm -rf .git/objects);
+ symlink "../../objects", ".git/objects" or die $!;
+ runcmd qw(git checkout -q), $old;
+
+ open C, "debian/changelog" or die $!;
+ my $clog = do {
+ local $/ = undef;
+ <C>;
+ };
+ C->error and die $!;
+ close C or die $!;
+ defined $clog or die $!;
+
+ $!=0; $?=0;
+ my $v = `dpkg-parsechangelog`;
+ die "$ref $veryold $old $? $!" if $?;
+ $v =~ m/^Source: (\S+)$/m or die "$ref $veryold $old ?";
+ my $pkg = $1;
+ $v =~ m/^Version: (\S+)$/m or die "$ref $veryold $old ?";
+ my $vsn = $1;
+ $vsn .= "+~dgitfix";
+
+ open C, ">", "debian/changelog" or die $!;
+ print C <<END;
+$pkg ($vsn) UNRELEASED; urgency=low
+
+ * Additional commit, with slightly incremented version number,
+ to override bad commits generated by dgit due to #849041.
+ * No changes to the package.
+ * Not uploaded anywhere.
+
+ -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
+
+END
+ print C $clog or die $!;
+ close C or die $!;
+
+ runcmd qw(git commit -q),
+ '--author=Ian Jackson <ijackson@chiark.greenend.org.uk>',
+ qw(-m), 'Dummy changelog entry to work around #849041 fallout',
+ qw(debian/changelog);
+
+ $!=0; $?=0;
+ my $new = `git rev-parse HEAD`;
+ die "$? $!" if $?;
+ chomp $new or die;
+
+ chdir '..' or die $!;
+ runcmd qw(rm -rf), $td;
+
+ $count{dummyadded}++;
+
+ return $new;
+}
+