From 2093c3c0d973b6e9d4b7085ac3084de94550744f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 26 Jun 2018 18:43:49 +0100
Subject: [PATCH] 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>
---
 debian/changelog | 2 ++
 git-debrebase    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 70d600ff..0dc30141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (5.3~) unstable; urgency=medium
 
   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 fe11251a..658884d2 100755
--- 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);
+    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
 }
-- 
2.30.2