Merge tag 'debian/5.8' into stretch-bpo

dgit release 5.8 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Sun 08 Jul 2018 11:43:29 BST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

1 files changed, 16 insertions, 0 deletions

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 57b79e8..5106f85 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -52,6 +52,7 @@ BEGIN {
 		      git_get_ref git_get_symref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
 		      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
@@ -492,6 +493,21 @@ 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 @_;
+    $msg = git_reflog_action_msg $msg;
+    return qw(git update-ref -m), $msg, @_;
+}
+
 sub changedir ($) {
     my ($newdir) = @_;
     printdebug "CD $newdir\n";