From b00a983b0e826d5142598cafb62d5628edc38e82 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Sun, 13 Oct 2019 04:24:35 +0300
Subject: [PATCH] vcs: non-modal: Update commit options based on current change
 list on "Commit" invocation (IDEA-216219)

GitOrigin-RevId: 29c4318cef89d7968dee2a393bc29603cb27d32e
---
 .../intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt b/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt
index f4d61cd35e64..0355a9055032 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt
@@ -73,6 +73,8 @@ class ChangesViewCommitWorkflowHandler(
 
       workflow.initCommitOptions(createCommitOptions())
       commitOptions.restoreState()
+
+      currentChangeList?.let { commitOptions.changeListChanged(it) }
     }
     return commitOptions
   }
@@ -175,6 +177,8 @@ class ChangesViewCommitWorkflowHandler(
 
     val newCommitMessage = newChangeList?.let { commitMessagePolicy.getCommitMessage(it) { getIncludedChanges() } }
     setCommitMessage(newCommitMessage)
+
+    newChangeList?.let { commitOptions.changeListChanged(it) }
   }
 
   override fun inclusionChanged() {