Skip to content

Commit 2282be5

Browse files
authored
Fix edit session partial matches (microsoft#165782)
1 parent 04fbbf2 commit 2282be5

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

extensions/git/src/editSessionIdentityProvider.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit
4646
normalizedIdentity1.sha === normalizedIdentity2.sha) {
4747
// This is a perfect match
4848
return vscode.EditSessionIdentityMatch.Complete;
49-
} else if (normalizedIdentity1.sha !== normalizedIdentity2.sha) {
49+
} else if (normalizedIdentity1.remote === normalizedIdentity2.remote &&
50+
normalizedIdentity1.ref === normalizedIdentity2.ref &&
51+
normalizedIdentity1.sha !== normalizedIdentity2.sha) {
5052
// Same branch and remote but different SHA
5153
return vscode.EditSessionIdentityMatch.Partial;
5254
} else {

0 commit comments

Comments
 (0)