diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index 89cbaa5314d..dc59c3342d7 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -168,7 +168,7 @@ "config.smartCommitChanges.all": "Automatically stage all changes.", "config.smartCommitChanges.tracked": "Automatically stage tracked changes only.", "config.suggestSmartCommit": "Suggests to enable smart commit (commit all changes when there are no staged changes).", - "config.enableCommitSigning": "Enables commit signing with GPG or X.509.", + "config.enableCommitSigning": "Enables commit signing with GPG, X.509, or SSH.", "config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.", "config.decorations.enabled": "Controls whether Git contributes colors and badges to the Explorer and the Open Editors view.", "config.enableStatusBarSync": "Controls whether the Git Sync command appears in the status bar.", diff --git a/extensions/git/src/askpass-main.ts b/extensions/git/src/askpass-main.ts index 16ac88a56eb..c2f59168c67 100644 --- a/extensions/git/src/askpass-main.ts +++ b/extensions/git/src/askpass-main.ts @@ -46,7 +46,9 @@ function main(argv: string[]): void { if (askpassType === 'ssh') { if (/passphrase/i.test(request)) { // passphrase - file = argv[6].replace(/^["']+|["':]+$/g, ''); + // Commit signing - Enter passphrase: + // Git operation - Enter passphrase for key '/c/Users//.ssh/id_ed25519': + file = argv[6]?.replace(/^["']+|["':]+$/g, ''); } else { // authenticity host = argv[6].replace(/^["']+|["':]+$/g, ''); diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass.ts index 7821ce112e8..6b27d876185 100644 --- a/extensions/git/src/askpass.ts +++ b/extensions/git/src/askpass.ts @@ -102,7 +102,7 @@ export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider { const options: InputBoxOptions = { password: true, placeHolder: l10n.t('Passphrase'), - prompt: `SSH Key: ${file}`, + prompt: file ? `SSH Key: ${file}` : undefined, ignoreFocusOut: true };