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

IDEA-286271 git: fix branch list parsing in "Git Merge" dialog

Browse Source 
Properly handle branch type mark prefixes.

GitOrigin-RevId: 0a67a3dd411af8c23ac7854bfd1dd7313ce69920
This commit is contained in:
Aleksey Pivovarov
2022-01-12 13:31:06 +00:00
committed by intellij-monorepo-bot
parent 5897b786e1
commit c2106a89e4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
+9 -2
View File
@@ -208,8 +208,14 @@ class GitMergeDialog(private val project: Project,
try {
result = Git.getInstance().runCommand(handler).getOutputOrThrow()
.lines()
.filter { branch -> !LINK_REF_REGEX.matcher(branch).matches() }
.map { it.trim() }
.filter { line -> !LINK_REF_REGEX.matcher(line).matches() }
.mapNotNull { line ->
val matcher = BRANCH_NAME_REGEX.matcher(line)
when {
matcher.matches() -> matcher.group(1)
else -> null
}
}
}
catch (e: Exception) {
LOG.warn("Failed to load unmerged branches for root: ${root}", e)
@@ -419,6 +425,7 @@ class GitMergeDialog(private val project: Project,
companion object {
private val LOG = logger<GitMergeDialog>()
private val LINK_REF_REGEX = Pattern.compile(".+\\s->\\s.+")
private val BRANCH_NAME_REGEX = Pattern.compile(". (.+\\s*)")
@NlsSafe
private const val REMOTE_REF = "remotes/"