From 00802b6317469a26efc94ae56366d12da79466f1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 24 Sep 2014 00:06:48 +0200 Subject: [PATCH] [cli] Use chaining credentials provider to enable .netrc If available use credentials in .netrc otherwise prompt the user if jgit command line needs credentials for remote operations. Change-Id: Iea1f595618edfb87a37137db08bac8ca2d500ebc Signed-off-by: Matthias Sohn --- .../eclipse/jgit/console/ConsoleCredentialsProvider.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java index 91034fd2c..a01fd86b4 100644 --- a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java +++ b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java @@ -48,8 +48,10 @@ package org.eclipse.jgit.console; import java.io.Console; import org.eclipse.jgit.errors.UnsupportedCredentialItem; +import org.eclipse.jgit.transport.ChainingCredentialsProvider; import org.eclipse.jgit.transport.CredentialItem; import org.eclipse.jgit.transport.CredentialsProvider; +import org.eclipse.jgit.transport.NetRCCredentialsProvider; import org.eclipse.jgit.transport.URIish; /** Interacts with the user during authentication by using the text console. */ @@ -60,7 +62,9 @@ public class ConsoleCredentialsProvider extends CredentialsProvider { if (c.cons == null) throw new NoClassDefFoundError( ConsoleText.get().noSystemConsoleAvailable); - CredentialsProvider.setDefault(c); + CredentialsProvider cp = new ChainingCredentialsProvider( + new NetRCCredentialsProvider(), c); + CredentialsProvider.setDefault(cp); } private final Console cons = System.console();