X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=658884d2d062fa5bb068ad2edd4d7e59bfd9bd1e;hp=fd05c6b46a67ab92e2db225e198910d17cb5c9ec;hb=53d416f00482f3e004cb81e51de2ee111fee8d9e;hpb=53389b4ddc2d290f83e439fe36081e2d3e8d4b4c diff --git a/git-debrebase b/git-debrebase index fd05c6b4..658884d2 100755 --- a/git-debrebase +++ b/git-debrebase @@ -118,7 +118,7 @@ sub run_deferred_updates ($) { confess 'dangerous internal error' unless all_snags_summarised(); - my @upd_cmd = (@git, qw(update-ref --stdin -m), "debrebase: $mrest"); + my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin)); debugcmd '>|', @upd_cmd; open U, "|-", @upd_cmd or die $!; foreach (@deferred_updates) { @@ -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 }