[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ksshaskpass] src: Merge remote-tracking branch 'origin/Plasma/5.12'
From:       Luca Beltrame <null () kde ! org>
Date:       2018-01-21 9:26:52
Message-ID: E1edBts-0002GX-1B () code ! kde ! org
[Download RAW message or body]

Git commit 7a1ebd5dc8b22157768eac71f3873602b349d51c by Luca Beltrame.
Committed on 21/01/2018 at 09:26.
Pushed by lbeltrame into branch 'master'.

Merge remote-tracking branch 'origin/Plasma/5.12'

M  +12   -1    src/main.cpp

https://commits.kde.org/ksshaskpass/7a1ebd5dc8b22157768eac71f3873602b349d51c

diff --cc src/main.cpp
index b3d0587,b9df45f..664ee25
--- a/src/main.cpp
+++ b/src/main.cpp
@@@ -68,8 -69,17 +69,17 @@@ static void parsePrompt(const QString &
              return;
          }
  
+         // Case 3a: password extraction from git-lfs
+         QRegularExpression re3a("^(Password|Username) for \"(.*?)\"$");
+         QRegularExpressionMatch match3a = re3a.match(prompt);
+         if (match3a.hasMatch()) {
+             keyFile = match3a.captured(2);
+             wrongPassphrase = false;
+             return;
+         }
+ 
          // Case 4: password extraction from mercurial, see bug 380085
 -        QRegularExpression re4("^(.*?)'s password: $");
 +        QRegularExpression re4(QStringLiteral("^(.*?)'s password: $"));
          QRegularExpressionMatch match4 = re4.match(prompt);
          if (match4.hasMatch()) {
              keyFile = match4.captured(1);
[prev in list] [next in list] [prev in thread] [next in thread]