Passes merge target more consistently and fixes checkout

Author: axosoft-ramint

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

@@ -285,14 +285,25 @@ export class GlMergeTargetStatus extends LitElement {
 	private renderContent() {
 		const target = renderBranchName(this.target?.name);
 
+		const mergeTargetRef =
+			this.mergedStatus?.merged && this.mergedStatus.localBranchOnly
+				? {
+						repoPath: this.branch.repoPath,
+						branchId: this.mergedStatus.localBranchOnly.id!,
+						branchName: this.mergedStatus.localBranchOnly.name,
+						branchUpstreamName: this.mergedStatus.localBranchOnly.upstream?.name,
+				  }
+				: this.target
+				  ? {
+							repoPath: this.target.repoPath,
+							branchId: this.target.id,
+							branchName: this.target.name,
+							branchUpstreamName: undefined,
+				    }
+				  : undefined;
+
 		if (this.mergedStatus?.merged) {
 			if (this.mergedStatus.localBranchOnly) {
-				const mergeTargetRef = {
-					repoPath: this.branch.repoPath,
-					branchId: this.mergedStatus.localBranchOnly.id!,
-					branchName: this.mergedStatus.localBranchOnly.name,
-					branchUpstreamName: this.mergedStatus.localBranchOnly.upstream?.name,
-				};
 				return html`<div class="header">
 						<span class="header__title"
 							><code-icon icon="git-merge"></code-icon> Branch
@@ -312,7 +323,7 @@ export class GlMergeTargetStatus extends LitElement {
 								full
 								href="${createCommandLink(
 									'gitlens.home.pushBranch',
-									mergeTargetRef satisfies BranchRef,
+									mergeTargetRef! satisfies BranchRef,
 								)}"
 								>Push ${renderBranchName(this.mergedStatus.localBranchOnly.name)}</gl-button
 							>
@@ -350,7 +361,10 @@ export class GlMergeTargetStatus extends LitElement {
 					<div class="button-container">
 						<gl-button
 							full
-							href="${createCommandLink('gitlens.home.deleteBranchOrWorktree', this.branchRef)}"
+							href="${createCommandLink('gitlens.home.deleteBranchOrWorktree', [
+								this.branchRef,
+								mergeTargetRef,
+							])}"
 							>Delete
 							${this.branch.worktree != null && !this.branch.worktree.isDefault ? 'Worktree' : 'Branch'}
 							${renderBranchName(this.branch.name, this.branch.worktree != null)}</gl-button

src/webviews/home/homeWebview.ts

@@ -36,6 +36,7 @@ import { getBranchTargetInfo } from '../../git/utils/-webview/branch.utils';
 import { getReferenceFromBranch } from '../../git/utils/-webview/reference.utils';
 import { sortBranches } from '../../git/utils/-webview/sorting';
 import { getOpenedWorktreesByBranch, groupWorktreesByBranch } from '../../git/utils/-webview/worktree.utils';
+import { getBranchNameWithoutRemote } from '../../git/utils/branch.utils';
 import { getComparisonRefsForPullRequest } from '../../git/utils/pullRequest.utils';
 import { createRevisionRange } from '../../git/utils/revision.utils';
 import { showPatchesView } from '../../plus/drafts/actions';
@@ -1191,9 +1192,10 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		const repo = this._repositoryBranches.get(ref.repoPath);
 		const branch = repo?.branches.find(b => b.id === ref.branchId);
 		if (branch == null) return;
-		if (branch.current) {
+		if (branch.current && mergeTarget != null) {
 			if (mergeTarget != null) {
-				await this.container.git.checkout(ref.repoPath, mergeTarget.branchName);
+				const mergeTargetLocalBranch = getBranchNameWithoutRemote(mergeTarget.branchName);
+				await this.container.git.checkout(ref.repoPath, mergeTargetLocalBranch);
 			}
 		}