Fixes #4060 invalid raf names

Author: eamodio

CHANGELOG.md

@@ -8,7 +8,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
-- Fixes [#3841](https://github.com/gitkraken/vscode-gitlens/issues/3841) - Inspect & Graph Details: autolinks rendering when enabled setting is false
+- Fixes Inspect & Graph Details: autolinks rendering when enabled setting is false ([#3841](https://github.com/gitkraken/vscode-gitlens/issues/3841))
+- Fixes comparison with Merge Target on Home fails to open a valid comparison ([#4060](https://github.com/gitkraken/vscode-gitlens/issues/4060))
 
 ## [16.3.0] - 2025-02-11
 

src/webviews/apps/plus/home/components/merge-target-status.ts

@@ -2,7 +2,7 @@ import { css, html, LitElement, nothing } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { createCommandLink } from '../../../../../system/commands';
 import { pluralize } from '../../../../../system/string';
-import type { BranchRef, GetOverviewBranch } from '../../../../home/protocol';
+import type { BranchAndTargetRefs, BranchRef, GetOverviewBranch } from '../../../../home/protocol';
 import { renderBranchName } from '../../../shared/components/branch-name';
 import { elementBase, linkBase, scrollableBase } from '../../../shared/components/styles/lit/base.css';
 import { chipStyles } from '../../shared/components/chipStyles';
@@ -414,19 +414,27 @@ export class GlMergeTargetStatus extends LitElement {
 	}
 
 	private renderActions() {
+		const branchRef = this.branchRef;
+		const targetRef = this.targetBranchRef;
+
 		return html`<span class="header__actions"
-			><gl-button
-				href="${createCommandLink('gitlens.home.openMergeTargetComparison', {
-					...this.branchRef,
-					mergeTargetId: this.targetBranchRef?.branchId,
-				})}"
+			>${branchRef && targetRef
+				? html`<gl-button
+						href="${createCommandLink<BranchAndTargetRefs>('gitlens.home.openMergeTargetComparison', {
+							...branchRef,
+							mergeTargetId: targetRef.branchId,
+							mergeTargetName: targetRef.branchName,
+						})}"
+						appearance="toolbar"
+						><code-icon icon="git-compare"></code-icon>
+						<span slot="tooltip"
+							>Compare Branch with Merge Target<br />${renderBranchName(this.branch.name)}
+							&leftrightarrow; ${renderBranchName(this.target?.name)}</span
+						>
+				  </gl-button>`
+				: nothing}<gl-button
+				href="${createCommandLink('gitlens.home.fetch', this.targetBranchRef)}"
 				appearance="toolbar"
-				><code-icon icon="git-compare"></code-icon>
-				<span slot="tooltip"
-					>Compare Branch with Merge Target<br />${renderBranchName(this.branch.name)} &leftrightarrow;
-					${renderBranchName(this.target?.name)}</span
-				> </gl-button
-			><gl-button href="${createCommandLink('gitlens.home.fetch', this.targetBranchRef)}" appearance="toolbar"
 				><code-icon icon="repo-fetch"></code-icon>
 				<span slot="tooltip">Fetch Merge Target<br />${renderBranchName(this.target?.name)}</span>
 			</gl-button></span

src/webviews/home/homeWebview.ts

@@ -68,6 +68,7 @@ import type { IpcMessage } from '../protocol';
 import type { WebviewHost, WebviewProvider, WebviewShowingArgs } from '../webviewProvider';
 import type { WebviewShowOptions } from '../webviewsController';
 import type {
+	BranchAndTargetRefs,
 	BranchRef,
 	CollapseSectionParams,
 	DidChangeRepositoriesParams,
@@ -1167,8 +1168,8 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		});
 	}
 
-	private mergeTargetCompare(ref: BranchRef & { mergeTargetId: string }) {
-		return this.container.views.searchAndCompare.compare(ref.repoPath, ref.branchId, ref.mergeTargetId);
+	private mergeTargetCompare(ref: BranchAndTargetRefs) {
+		return this.container.views.searchAndCompare.compare(ref.repoPath, ref.branchName, ref.mergeTargetName);
 	}
 
 	private async pullRequestCompare(ref: BranchRef) {

src/webviews/home/protocol.ts

@@ -322,3 +322,8 @@ export interface BranchRef {
 	branchId: string;
 	branchName: string;
 }
+
+export interface BranchAndTargetRefs extends BranchRef {
+	mergeTargetId: string;
+	mergeTargetName: string;
+}