git-debrebase new-upstream: Provide better reflog entries

By setting GIT_REFLOG_ACTION.

Closes:#901925.

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

diff --git a/debian/changelog b/debian/changelog
index 70d600ffadd2609e58d423fcb542543044a6aab8..0dc301413eb06e1e707536ed7d9a6b69ab61655f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (5.3~) unstable; urgency=medium
 
   Bugfixes:
   * Honour GIT_REFLOG_ACTION everywhere.  Closes:#901935.
 
   Bugfixes:
   * Honour GIT_REFLOG_ACTION everywhere.  Closes:#901935.

+  * git-debrebase new-upstream: Provide better reflog entries
+    by setting GIT_REFLOG_ACTION.  Closes:#901925.

 
  --
 
 
  --
 

diff --git a/git-debrebase b/git-debrebase
index fe11251a9a7d95022af614537c5a3cd09d42c182..658884d2d062fa5bb068ad2edd4d7e59bfd9bd1e 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1351,6 +1351,8 @@ END
         'launder for new upstream';
 
     my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw, @ARGV);
         'launder for new upstream';
 
     my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw, @ARGV);

+    local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
+       "debrebase new-upstream $new_version: rebase";

     runcmd @cmd;
     # now it's for the user to sort out
 }
     runcmd @cmd;
     # now it's for the user to sort out
 }