Allow merge branches

Kotlin · Apr 23, 2024 · d36eb1c · d36eb1c
1 parent 1241234
commit d36eb1c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/ConfigTest.kt b/src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/ConfigTest.kt
@@ -28,9 +28,10 @@ class ConfigTest {
             )
 
         val pullRegex = "(pull/[1-9]\\d*)"
+        val mergeRegex = "(refs/merge/.*)"
         val developersRegex = developers.joinToString("|", "(", ")") + "/.*"
 
-        if (!branch.matches(Regex("$pullRegex|$developersRegex"))) {
+        if (!branch.matches(Regex("$pullRegex|$mergeRegex|$developersRegex"))) {
             assertEquals(-1, branch.indexOf('/'), "Branch name should be simple")
         }