From 36ad98f976b71716b2eb4b91a584438c708fb2bc Mon Sep 17 00:00:00 2001
From: Dmitriy Smirnov <dmitriy.smirnov@jetbrains.com>
Date: Tue, 2 Jan 2018 01:55:10 +0300
Subject: [PATCH] IDEA-184450 Prompt for a new SSH passphrase after the saved
 one fails

---
 plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java b/plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java
index 11906fd5b37d..f9c971f26230 100644
--- a/plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java
+++ b/plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java
@@ -74,7 +74,7 @@ public class GitSSHGUIHandler {
     CredentialAttributes oldAttributes = oldCredentialAttributes("PASSPHRASE:" + keyPath);
     CredentialAttributes newAttributes = passphraseCredentialAttributes(keyPath);
     Credentials credentials = getAndMigrateCredentials(oldAttributes, newAttributes);
-    if (credentials != null) {
+    if (credentials != null && !resetPassword) {
       return credentials.getPasswordAsString();
     }
     return CredentialPromptDialog.askPassword(myProject, GitBundle.getString("ssh.ask.passphrase.title"),