Fixes #4246

Author: eamodio

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixes Git diff of a renamed file is shown as a new file ([#4246](https://github.com/gitkraken/vscode-gitlens/issues/4246))
+
 ## [17.5.1] - 2025-09-24
 
 ### Fixed

src/commands/diffWith.ts

@@ -146,8 +146,7 @@ export class DiffWithCommand extends GlCommandBase {
 			let lhsSuffix = shortenRevision(lhsResolved.revision);
 			if (lhsResolved.sha === deletedOrMissing) {
 				lhsSuffix = args.fromComparison ? `Missing${!lhsSuffix ? '' : ` in ${lhsSuffix}`}` : '';
-			}
-			if (lhs == null && !rhsResolved.sha) {
+			} else if (lhs == null && !rhsResolved.sha) {
 				if (rhs != null) {
 					lhsSuffix = !lhsSuffix ? '' : `Not in ${lhsSuffix}`;
 					rhsSuffix = '';

src/views/nodes/resultsFileNode.ts

@@ -132,12 +132,11 @@ export class ResultsFileNode extends ViewRefFileNode<'results-file', View, State
 			if (this.direction === 'behind') {
 				lhsUri = GitUri.fromFile(this.file, this.uri.repoPath!, this.ref2, true);
 				rhsUri = this.uri;
+			} else if (this.direction == null) {
+				lhsUri = GitUri.fromFile(this.file, this.uri.repoPath!, this.ref1, true);
+				rhsUri = GitUri.fromFile(this.file, this.uri.repoPath!, this.ref2, false);
 			} else {
-				if (this.direction == null) {
-					lhsUri = GitUri.fromFile(this.file, this.uri.repoPath!, this.ref1, true);
-				} else {
-					lhsUri = this.uri;
-				}
+				lhsUri = this.uri;
 				rhsUri = GitUri.fromFile(this.file, this.uri.repoPath!, this.ref2, true);
 			}
 		} else {