aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Pfeiffer2011-03-15 10:41:58 (EDT)
committerMatthias Sohn2011-05-25 12:15:10 (EDT)
commit1ed07bd98816889ad629f0629e301b824ece8038 (patch)
treed5579bafab73f22a0c185bcbda9275eaefee8c5c
parentbb63baa65808eef77b743565e8dfc74fb5ce2518 (diff)
downloadegit-1ed07bd98816889ad629f0629e301b824ece8038.zip
egit-1ed07bd98816889ad629f0629e301b824ece8038.tar.gz
egit-1ed07bd98816889ad629f0629e301b824ece8038.tar.bz2
Do not overwrite existing UserInfo instancerefs/changes/25/2725/6
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.java3
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 63ecc6c..a33c8de 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);
+ }
}
}