Dgit.pm: Split here doc for reflog cache commit message (nfc)

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index d2484f9423b7be4535ea22154db625b794660d10..941bcdcd329c39688929937ac665d02bc7a5d9fb 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -422,7 +422,7 @@ sub link_ltarget ($$) {
     }
     my $r = link $old, $new;
     $r = symlink $old, $new if !$r && $!==EXDEV;
-    $r or die "(sym)link $old $new: $!";
+    $r or fail "(sym)link $old $new: $!\n";
 }
 
 sub hashfile ($) {
@@ -630,7 +630,7 @@ sub parsecontrolfh ($$;$) {
        my %opts = ('name' => $desc);
        $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
        $c = Dpkg::Control::Hash->new(%opts);
-       $c->parse($fh,$desc) or die "parsing of $desc failed";
+       $c->parse($fh,$desc) or fail "parsing of $desc failed";
        last if $allowsigned;
        last if $dpkgcontrolhash_noissigned;
        my $issigned= $c->get_option('is_pgp_signed');
@@ -737,12 +737,13 @@ sub reflog_cache_insert ($$$) {
        # git update-ref doesn't always update, in this case.  *sigh*
        my $authline = (ucfirst _us()).
            ' <'._us().'@example.com> 1000000000 +0000';
-       my $dummy = make_commit_text <<END;
+       my $dummy = make_commit_text <<ENDU.<<END;
 tree $tree
 parent $value
 author $authline
 committer $authline
 
+ENDU
 Dummy commit - do not use
 END
        runcmd qw(git update-ref -m), _us()." - dummy", $ref, $dummy;