ref updates: Introduce update_ref_cmd

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index c0ee27fc4d3ca22c2e8735069ee97e440f8fb80e..2bac4859f887ee5a17788755e00cfa5537503669 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -51,7 +51,7 @@ BEGIN {
                       git_rev_parse git_cat_file
                      git_get_ref git_get_symref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
                       git_rev_parse git_cat_file
                      git_get_ref git_get_symref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd

-                     git_check_unmodified
+                     git_check_unmodified git_update_ref_cmd

                       $package_re $component_re $deliberately_re
                      $distro_re $versiontag_re $series_filename_re
                      $extra_orig_namepart_re
                       $package_re $component_re $deliberately_re
                      $distro_re $versiontag_re $series_filename_re
                      $extra_orig_namepart_re


@@ -225,11 +225,11 @@ sub _us () {
 }
 
 sub failmsg {
 }
 
 sub failmsg {

-    my $s = "@_\n";
+    my $s = "error: @_\n";

     $s =~ s/\n\n$/\n/;
     my $prefix = _us().": ";
     $s =~ s/^/$prefix/gm;
     $s =~ s/\n\n$/\n/;
     my $prefix = _us().": ";
     $s =~ s/^/$prefix/gm;

-    return $s;
+    return "\n".$s;

 }
 
 sub fail {
 }
 
 sub fail {


@@ -492,6 +492,13 @@ sub is_fast_fwd ($$) {
     }
 }
 
     }
 }
 

+sub git_update_ref_cmd {
+    # returns  qw(git update-ref), qw(-m), @_
+    # except that message may be modified to honour GIT_REFLOG_ACTION
+    my $msg = shift @_;
+    return qw(git update-ref -m), $msg, @_;
+}
+

 sub changedir ($) {
     my ($newdir) = @_;
     printdebug "CD $newdir\n";
 sub changedir ($) {
     my ($newdir) = @_;
     printdebug "CD $newdir\n";