badcommit-fixup: dummy add seems workingish

diff --git a/badcommit-fixup b/badcommit-fixup
index 732974c10e28e5bad7d90fce0b12f8443b29080a..b1268f5b5671c88a6d46e751a12b9a9d9f963844 100755 (executable)
--- a/badcommit-fixup
+++ b/badcommit-fixup
@@ -47,7 +47,6 @@ sub getobj ($$) {
     $gtype eq $type or die "$obj $gtype != $type ?";
     my $gdata;
     (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
-#print STDERR ">$obj|$x|$gdata|$gsize<\n";
     $x = <GCFO>;
     $x eq "\n" or die "$obj ($_) $!";
     $count{inspected}++;
@@ -119,8 +118,10 @@ sub rewrite_commit_adddummy ($$$) {
     runcmd qw(git checkout -q), $old;
 
     open C, "debian/changelog" or die $!;
-    undef $/;
-    my $clog = <C>;
+    my $clog = do {
+       local $/ = undef;
+       <C>;
+    };
     C->error and die $!;
     close C or die $!;
     defined $clog or die $!;
@@ -138,10 +139,10 @@ sub rewrite_commit_adddummy ($$$) {
     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.
+  * 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
 
@@ -157,6 +158,7 @@ END
     $!=0; $?=0;
     my $new = `git rev-parse HEAD`;
     die "$? $!" if $?;
+    chomp $new or die;
 
     chdir '..' or die $!;
     runcmd qw(rm -rf), $td;