From 94697bc0171bc71bfe025547153b210869599e3e Mon Sep 17 00:00:00 2001
From: alexweininger <alex.weininger@live.com>
Date: Fri, 25 Apr 2025 14:49:02 -0700
Subject: [PATCH] fix: handle cancellation errors inside edit session identity
 provider

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

diff --git a/extensions/git/src/editSessionIdentityProvider.ts b/extensions/git/src/editSessionIdentityProvider.ts
index 8e172f2d17418..8380f03ecfd94 100644
--- a/extensions/git/src/editSessionIdentityProvider.ts
+++ b/extensions/git/src/editSessionIdentityProvider.ts
@@ -16,7 +16,13 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit
 		this.providerRegistration = vscode.Disposable.from(
 			vscode.workspace.registerEditSessionIdentityProvider('file', this),
 			vscode.workspace.onWillCreateEditSessionIdentity((e) => {
-				e.waitUntil(this._onWillCreateEditSessionIdentity(e.workspaceFolder));
+				e.waitUntil(
+					this._onWillCreateEditSessionIdentity(e.workspaceFolder).catch(err => {
+						if (err instanceof vscode.CancellationError) {
+							throw err;
+						}
+					})
+				);
 			})
 		);
 	}