ref updates: Break out git_reflog_action_msg

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 0a99faa4c2864dd0e543628561f09cf3c74ae560..5106f8517c4e08c26a67661c5e3fcbb17575cc5e 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -51,7 +51,8 @@ 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_update_ref_cmd
+                     git_check_unmodified
+                     git_reflog_action_msg  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


@@ -492,12 +493,18 @@ sub is_fast_fwd ($$) {
     }
 }
 
     }
 }
 

+sub git_reflog_action_msg ($) {
+    my ($msg) = @_;
+    my $rla = $ENV{GIT_REFLOG_ACTION};
+    $msg = "$rla: $msg" if length $rla;
+    return $msg;
+}
+

 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 @_;
 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 @_;

-    my $rla = $ENV{GIT_REFLOG_ACTION};
-    $msg = "$rla: $msg" if length $rla;
+    $msg = git_reflog_action_msg $msg;

     return qw(git update-ref -m), $msg, @_;
 }
 
     return qw(git update-ref -m), $msg, @_;
 }