MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: restore adding listeners to the cherry-pick command

Browse Source 
Accidentally removed during cleanup in 749b60a9

GitOrigin-RevId: 88adfdca19549c6f5d9b5eb474e9abe25939e21b
This commit is contained in:
Kirill Likhodedov
2019-08-22 01:50:10 +03:00
committed by intellij-monorepo-bot
parent b2cc69dd49
commit eef33a97be
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
+3 -1
View File
@@ -14,6 +14,7 @@ import git4idea.GitUtil;
import git4idea.GitVcs;
import git4idea.commands.Git;
import git4idea.commands.GitCommandResult;
import git4idea.commands.GitLineHandlerListener;
import git4idea.config.GitVcsApplicationSettings;
import git4idea.config.GitVcsSettings;
import git4idea.repo.GitRepository;
@@ -44,7 +45,8 @@ public class GitCherryPicker extends VcsCherryPicker {
public void cherryPick(@NotNull List<? extends VcsFullCommitDetails> commits) {
GitApplyChangesProcess applyProcess = new GitApplyChangesProcess(myProject, commits, isAutoCommit(), "cherry-pick", "applied",
(repository, commit, autoCommit, listeners) ->
Git.getInstance().cherryPick(repository, commit.asString(), autoCommit, shouldAddSuffix(repository, commit)),
Git.getInstance().cherryPick(repository, commit.asString(), autoCommit, shouldAddSuffix(repository, commit),
listeners.toArray(new GitLineHandlerListener[0])),
result -> isNothingToCommitMessage(result),
(repository, commit) -> createCommitMessage(repository, commit),
true,