fix(git): grouping prefers explicit write branch on config; fallback to app branch

Eidmantas Ivanauskas · Eidmantas Ivanauskas · commit 96cfeba583bd · 2025-09-17T18:06:16.000+03:00
diff --git a/pkg/argocd/git.go b/pkg/argocd/git.go
@@ -212,9 +212,9 @@ func (rw *repoWriter) flushBatch(batch []writeIntent) {
 func groupIntentsByBranch(batch []writeIntent) map[string][]writeIntent {
     byBranch := map[string][]writeIntent{}
     for _, wi := range batch {
-        branch := getWriteBackBranch(wi.app)
-        if wi.wbc.GitWriteBranch != "" {
-            branch = wi.wbc.GitWriteBranch
+        branch := wi.wbc.GitWriteBranch
+        if branch == "" {
+            branch = getWriteBackBranch(wi.app)
         }
         byBranch[branch] = append(byBranch[branch], wi)
     }

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,9 @@ func (rw *repoWriter) flushBatch(batch []writeIntent) {`
`212`	`212`	`func groupIntentsByBranch(batch []writeIntent) map[string][]writeIntent {`
`213`	`213`	`byBranch := map[string][]writeIntent{}`
`214`	`214`	`for _, wi := range batch {`
`215`		`- branch := getWriteBackBranch(wi.app)`
`216`		`- if wi.wbc.GitWriteBranch != "" {`
`217`		`- branch = wi.wbc.GitWriteBranch`
	`215`	`+ branch := wi.wbc.GitWriteBranch`
	`216`	`+ if branch == "" {`
	`217`	`+ branch = getWriteBackBranch(wi.app)`
`218`	`218`	`}`
`219`	`219`	`byBranch[branch] = append(byBranch[branch], wi)`
`220`	`220`	`}`