From 2677d2b115aceea71bc759f6f391972e34579e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Insaurralde?= Date: Fri, 27 Mar 2026 21:34:35 -0300 Subject: [PATCH] knotserver/git/merge: pre-compile conflict error regex at package init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Insaurralde --- knotserver/git/merge.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/knotserver/git/merge.go b/knotserver/git/merge.go index 0b5fbb7e..c2999c57 100644 --- a/knotserver/git/merge.go +++ b/knotserver/git/merge.go @@ -22,7 +22,8 @@ type MergeCheckCache struct { } var ( - mergeCheckCache MergeCheckCache + mergeCheckCache MergeCheckCache + conflictErrorRegex = regexp.MustCompile(`^error: (.*):(\d+): (.*)$`) ) func init() { @@ -408,7 +409,7 @@ func parseGitApplyErrors(errorOutput string) []ConflictInfo { continue } - if match := regexp.MustCompile(`^error: (.*):(\d+): (.*)$`).FindStringSubmatch(line); len(match) >= 4 { + if match := conflictErrorRegex.FindStringSubmatch(line); len(match) >= 4 { if currentFile == "" { currentFile = match[1] } -- 2.51.2