Updates fn call

axosoft-ramint · axosoft-ramint · commit 2e84cc6274b3 · 2025-03-11T10:36:44.000-07:00
diff --git a/src/env/node/git/sub-providers/branches.ts b/src/env/node/git/sub-providers/branches.ts
@@ -433,7 +433,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 			}
 
 			// Attempt to detect squash merges by checking if the diff of the branch can be cleanly removed from the target
-			const mergeBase = await this.getMergeBase(repoPath, into.name, branch.name);
+			const mergeBase = await this.provider.refs.getMergeBase(repoPath, into.name, branch.name);
 			data = await this.git.exec<string>({ cwd: repoPath }, 'diff', mergeBase, branch.name);
 			if (data?.length) {
 				// Create a temporary index file

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`// Attempt to detect squash merges by checking if the diff of the branch can be cleanly removed from the target`
`436`		`- const mergeBase = await this.getMergeBase(repoPath, into.name, branch.name);`
	`436`	`+ const mergeBase = await this.provider.refs.getMergeBase(repoPath, into.name, branch.name);`
`437`	`437`	`data = await this.git.exec<string>({ cwd: repoPath }, 'diff', mergeBase, branch.name);`
`438`	`438`	`if (data?.length) {`
`439`	`439`	`// Create a temporary index file`