use the same ref to check branch existance and merge-base calculation (…

…#601) fix #577 Signed-off-by: Cyril Jouve <[email protected]>
helm · Oct 27, 2023 · 10aaf46 · 10aaf46
1 parent c1b0316
commit 10aaf46
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go
@@ -722,11 +722,12 @@ func (t *Testing) computeMergeBase() (string, error) {
 		return "", errors.New("must be in a git repository")
 	}
 
-	if !t.git.BranchExists(t.config.TargetBranch) {
-		return "", fmt.Errorf("targetBranch '%s' does not exist", t.config.TargetBranch)
+	branch := fmt.Sprintf("%s/%s", t.config.Remote, t.config.TargetBranch)
+	if !t.git.BranchExists(branch) {
+		return "", fmt.Errorf("targetBranch '%s' does not exist", branch)
 	}
 
-	return t.git.MergeBase(fmt.Sprintf("%s/%s", t.config.Remote, t.config.TargetBranch), t.config.Since)
+	return t.git.MergeBase(branch, t.config.Since)
 }
 
 // ComputeChangedChartDirectories takes the merge base of HEAD and the configured remote and target branch and computes a