From a64dd72457ae58e964c80c6f76fe9555fcad08ea Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 31 Aug 2017 19:30:50 +0300 Subject: [PATCH] Fix progress text for "Interactively Rebase from Here" "Preparing for rebase" can be used only before the interactive rebase dialog is shown, afterwards it should be substituted with "Rebasing". However, it is a bit tedious to customize the progress text at that stage, so keeping it simple for now. --- .../git4idea/src/git4idea/rebase/GitInteractiveRebaseAction.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseAction.kt b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseAction.kt index 4842e8d8ea92..c73566a07160 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseAction.kt +++ b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseAction.kt @@ -33,7 +33,7 @@ class GitInteractiveRebaseAction : GitCommitEditingAction() { val project = e.project!! val repository = getRepository(e) - object : Task.Backgroundable(project, "Preparing to rebase") { + object : Task.Backgroundable(project, "Rebasing") { override fun run(indicator: ProgressIndicator) { val params = GitRebaseParams.editCommits(commit.parents.first().asString(), null, false) GitRebaseUtils.rebase(project, listOf(repository), params, indicator);