diff options
| author | Carsten Pfeiffer | 2011-03-15 14:41:58 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-05-25 16:15:10 +0000 |
| commit | 1ed07bd98816889ad629f0629e301b824ece8038 (patch) | |
| tree | d5579bafab73f22a0c185bcbda9275eaefee8c5c | |
| parent | bb63baa65808eef77b743565e8dfc74fb5ce2518 (diff) | |
| download | egit-1ed07bd98816889ad629f0629e301b824ece8038.tar.gz egit-1ed07bd98816889ad629f0629e301b824ece8038.tar.xz egit-1ed07bd98816889ad629f0629e301b824ece8038.zip | |
Do not overwrite existing UserInfo instance
Only supply a new UserInfo instance if there is none yet, otherwise
the secure-storage supplied credentials are never taken into account
Depends on jgit change Iedc80e133e66d72e78ff0980b6e12634f75eca36
Bug: 308205
Change-Id: Iba3b87293c22e5fe7d989fc312184aa7463c4387
Signed-off-by: Carsten Pfeiffer <carsten.pfeiffer@gebit.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseSshSessionFactory.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseSshSessionFactory.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseSshSessionFactory.java index 63ecc6cebb..a33c8de4c1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseSshSessionFactory.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseSshSessionFactory.java @@ -57,7 +57,8 @@ class EclipseSshSessionFactory extends JschConfigSessionFactory { @Override protected void configure(final OpenSshConfig.Host hc, final Session session) { - if (!hc.isBatchMode()) + if (!hc.isBatchMode() && session.getUserInfo() == null) { new UserInfoPrompter(session); + } } } |