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

Do not drop commit message in git merge dialog if -m option is selected IDEA-242898

Browse Source 
GitOrigin-RevId: f867c07053b38fa30af580b05798ac4a72eb36fd
This commit is contained in:
Daniil Tsaryov
2020-06-08 20:52:30 +03:00
committed by intellij-monorepo-bot
parent 001b02dfce
commit 3e24a07e2a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
+5 -2
View File
@@ -359,8 +359,11 @@ class GitMergeDialog(private val project: Project,
}
private fun updateCommitMessagePanel() {
commitMsgPanel.isVisible = MergeOption.COMMIT_MESSAGE in selectedOptions
commitMsgField.text = ""
val useCommitMsg = MergeOption.COMMIT_MESSAGE in selectedOptions
commitMsgPanel.isVisible = useCommitMsg
if (!useCommitMsg) {
commitMsgField.text = ""
}
}
private fun createOptionButton(option: MergeOption) = OptionButton(option, option.option) { optionChosen(option) }