Git - fix file path parsing issue in askpass

extensions/git/src/askpass.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { window, InputBoxOptions, Uri, Disposable, workspace, QuickPickOptions, l10n, LogOutputChannel } from 'vscode';
-import { IDisposable, EmptyDisposable, toDisposable } from './util';
+import { IDisposable, EmptyDisposable, toDisposable, extractFilePathFromArgs } from './util';
 import * as path from 'path';
 import { IIPCHandler, IIPCServer } from './ipc/ipcServer';
 import { CredentialsProvider, Credentials } from './api/git';
@@ -108,7 +108,7 @@ export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider {
 		if (/passphrase/i.test(request)) {
 			// Commit signing - Enter passphrase:
 			// Git operation  - Enter passphrase for key '/c/Users/<username>/.ssh/id_ed25519':
-			const file = argv[6]?.replace(/^["']+|["':]+$/g, '');
+			const file = extractFilePathFromArgs(argv, 6);
 
 			this.logger.trace(`[Askpass][handleSSHAskpass] request: ${request}, file: ${file}`);
 

extensions/git/src/util.ts

@@ -790,3 +790,35 @@ export function toDiagnosticSeverity(value: DiagnosticSeverityConfig): Diagnosti
 				? DiagnosticSeverity.Information
 				: DiagnosticSeverity.Hint;
 }
+
+export function extractFilePathFromArgs(argv: string[], startIndex: number): string {
+	// Argument doesn't start with a quote
+	const firstArg = argv[startIndex];
+	if (!firstArg.match(/^["']/)) {
+		return firstArg.replace(/^["']+|["':]+$/g, '');
+	}
+
+	// If it starts with a quote, we need to find the matching closing
+	// quote which might be in a later argument if the path contains
+	// spaces
+	const quote = firstArg[0];
+
+	// If the first argument ends with the same quote, it's complete
+	if (firstArg.endsWith(quote) && firstArg.length > 1) {
+		return firstArg.slice(1, -1);
+	}
+
+	// Concatenate arguments until we find the closing quote
+	let path = firstArg;
+	for (let i = startIndex + 1; i < argv.length; i++) {
+		path = `${path} ${argv[i]}`;
+		if (argv[i].endsWith(quote)) {
+			// Found the matching quote
+			return path.slice(1, -1);
+		}
+	}
+
+	// If no closing quote was found, remove
+	// leading quote and return the path as-is
+	return path.slice(1);
+}