Falls back to std merge-base if --fork-point fails

src/git/gitService.ts

@@ -2334,7 +2334,7 @@ export class GitService implements Disposable {
 			const data = await Git.merge_base(repoPath, ref1, ref2, options);
 			if (data == null) return undefined;
 
-			return data.split('\n')[0];
+			return data.split('\n')[0].trim() || undefined;
 		} catch (ex) {
 			Logger.error(ex, cc);
 			return undefined;

src/views/nodes/compareBranchNode.ts

@@ -72,9 +72,9 @@ export class CompareBranchNode extends ViewNode
 			const aheadBehindCounts = await Container.git.getAheadBehindCommitCount(this.branch.repoPath, [
 				GitRevision.createRange(behind.ref1, behind.ref2, '...'),
 			]);
-			const mergeBase = await Container.git.getMergeBase(this.branch.repoPath, behind.ref1, behind.ref2, {
-				forkPoint: true,
-			});
+			const mergeBase =
+				(await Container.git.getMergeBase(this.repoPath, behind.ref1, behind.ref2, { forkPoint: true })) ??
+				(await Container.git.getMergeBase(this.repoPath, behind.ref1, behind.ref2));
 
 			this._children = [
 				new ResultsCommitsNode(

src/views/nodes/compareResultsNode.ts

@@ -77,9 +77,9 @@ export class CompareResultsNode extends ViewNode {
 			const aheadBehindCounts = await Container.git.getAheadBehindCommitCount(this.repoPath, [
 				GitRevision.createRange(behind.ref1 || 'HEAD', behind.ref2, '...'),
 			]);
-			const mergeBase = await Container.git.getMergeBase(this.repoPath, behind.ref1, behind.ref2, {
-				forkPoint: true,
-			});
+			const mergeBase =
+				(await Container.git.getMergeBase(this.repoPath, behind.ref1, behind.ref2, { forkPoint: true })) ??
+				(await Container.git.getMergeBase(this.repoPath, behind.ref1, behind.ref2));
 
 			this._children = [
 				new ResultsCommitsNode(