From 3a7e9a434300cfd3dbf6cecf21144f42c9e0a2b1 Mon Sep 17 00:00:00 2001
From: Or Toren <ort@jfrog.com>
Date: Mon, 2 Mar 2026 09:43:27 +0200
Subject: [PATCH] fix branch name template for aggregated case

---
 utils/git.go      |  6 +++++-
 utils/git_test.go | 14 ++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/utils/git.go b/utils/git.go
index 5e1375a1a..26de42465 100644
--- a/utils/git.go
+++ b/utils/git.go
@@ -541,7 +541,11 @@ func (gm *GitManager) GenerateAggregatedFixBranchName(baseBranch string, tech []
 	if err != nil {
 		return "", err
 	}
-	return formatStringWithPlaceHolders(branchFormat, "", "", hash, baseBranch, false), nil
+	if branchFormat != AggregatedBranchNameTemplate {
+		return formatStringWithPlaceHolders(branchFormat, "", "", hash, "", false), nil // custom: no suffix
+	} else {
+		return formatStringWithPlaceHolders(branchFormat, "", "", hash, baseBranch, false), nil // default: append base branch
+	}
 }
 
 // dryRunClone clones an existing repository from our testdata folder into the destination folder for testing purposes.
diff --git a/utils/git_test.go b/utils/git_test.go
index 25e15854f..ef4d81eea 100644
--- a/utils/git_test.go
+++ b/utils/git_test.go
@@ -160,16 +160,22 @@ func TestGitManager_GenerateAggregatedFixBranchName(t *testing.T) {
 			gitManager: GitManager{},
 		},
 		{
-			expected:   "[feature]-e4e1fa318f12b3bed84b13ae5c293108-main",
+			expected:   "[feature]-e4e1fa318f12b3bed84b13ae5c293108",
 			baseBranch: "main",
-			desc:       "Custom template hash only",
+			desc:       "Custom template hash only - no base branch suffix",
 			gitManager: GitManager{customTemplates: CustomTemplates{branchNameTemplate: "[feature]-${BRANCH_NAME_HASH}"}},
 		}, {
-			expected:   "[feature]-697bdb58caaed95527fc709da59ca47f-master",
+			expected:   "[feature]-697bdb58caaed95527fc709da59ca47f",
 			baseBranch: "master",
-			desc:       "Custom template hash only",
+			desc:       "Custom template hash only - no base branch suffix",
 			gitManager: GitManager{customTemplates: CustomTemplates{branchNameTemplate: "[feature]-${BRANCH_NAME_HASH}"}},
 		},
+		{
+			expected:   "bugfix/FRGBT-000_e4e1fa318f12b3bed84b13ae5c293108-",
+			baseBranch: "main",
+			desc:       "Custom template with IMPACTED_PACKAGE empty (aggregated) - no forced suffix",
+			gitManager: GitManager{customTemplates: CustomTemplates{branchNameTemplate: "bugfix/FRGBT-000_{BRANCH_NAME_HASH}-{IMPACTED_PACKAGE}"}},
+		},
 	}
 	for _, test := range testCases {
 		t.Run(test.desc, func(t *testing.T) {