From 2282be522a8031209a739783baede67bfa9fc95a Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Mon, 7 Nov 2022 20:56:53 -0800
Subject: [PATCH] Fix edit session partial matches (#165782)

---
 extensions/git/src/editSessionIdentityProvider.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/git/src/editSessionIdentityProvider.ts b/extensions/git/src/editSessionIdentityProvider.ts
index eb753d69865..5227741c422 100644
--- a/extensions/git/src/editSessionIdentityProvider.ts
+++ b/extensions/git/src/editSessionIdentityProvider.ts
@@ -46,7 +46,9 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit
 				normalizedIdentity1.sha === normalizedIdentity2.sha) {
 				// This is a perfect match
 				return vscode.EditSessionIdentityMatch.Complete;
-			} else if (normalizedIdentity1.sha !== normalizedIdentity2.sha) {
+			} else if (normalizedIdentity1.remote === normalizedIdentity2.remote &&
+				normalizedIdentity1.ref === normalizedIdentity2.ref &&
+				normalizedIdentity1.sha !== normalizedIdentity2.sha) {
 				// Same branch and remote but different SHA
 				return vscode.EditSessionIdentityMatch.Partial;
 			} else {