From ada90ecf958dfb431b3abd3fe36f5ec14fe140e8 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Tue, 20 Oct 2020 01:43:59 +0300
Subject: [PATCH] [cherry-pick] always auto-commit cherry-pick when changelists
 are disabled

GitOrigin-RevId: fcdabe9bf7ae50876ba18461d299223b569e896d
---
 plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
index b9c3ab4960f4..d185a4a20445 100644
--- a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
+++ b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
@@ -87,6 +87,7 @@ class GitApplyChangesProcess(private val project: Project,
                              commits: List<VcsFullCommitDetails>,
                              successfulCommits: MutableList<VcsFullCommitDetails>,
                              alreadyPicked: MutableList<VcsFullCommitDetails>): Boolean {
+    val doAutoCommit = autoCommit || !changeListManager.areChangeListsEnabled()
     for (commit in commits) {
       val conflictDetector = GitSimpleEventDetector(CHERRY_PICK_CONFLICT)
       val localChangesOverwrittenDetector = GitSimpleEventDetector(LOCAL_CHANGES_OVERWRITTEN_BY_CHERRY_PICK)
@@ -100,11 +101,11 @@ class GitApplyChangesProcess(private val project: Project,
       try {
         if (changeListManager.areChangeListsEnabled()) changeListManager.setDefaultChangeList(changeList, true)
 
-        val result = command(repository, commit.id, autoCommit,
+        val result = command(repository, commit.id, doAutoCommit,
                              listOf(conflictDetector, localChangesOverwrittenDetector, untrackedFilesDetector))
 
         if (result.success()) {
-          if (autoCommit) {
+          if (doAutoCommit) {
             refreshChangedVfs(repository, startHash)
             successfulCommits.add(commit)
           }