diff options
author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-10-16 22:33:58 +0300 |
---|---|---|
committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-10-16 22:33:58 +0300 |
commit | 61a1d85137183054bd9d932620aec20d6d841f34 (patch) | |
tree | 386d86b6066a2a13b5cae82e869b142d2f805df4 /main/src/addins/VersionControl | |
parent | 19e259c853502081f73c531b7241e6db6d6e0d9e (diff) |
Revert "[Git] Disable agent support on El Capitan+."
This reverts commit d11fee3f9bdc094f8c76e81d482af56895587bac.
This was actually a bug in the setup of the el capitan bots. :)
Diffstat (limited to 'main/src/addins/VersionControl')
-rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs index 9c9dfde998..f6aaa17013 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs @@ -78,12 +78,6 @@ namespace MonoDevelop.VersionControl.Git } } - static bool SshAgentSupported (GitCredentialsState state) - { - return !state.AgentUsed && - (Platform.IsLinux || (Platform.IsMac && MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan)); - } - public static Credentials TryGet (string url, string userFromUrl, SupportedCredentialTypes types, GitCredentialsType type) { bool result = true; @@ -114,7 +108,7 @@ namespace MonoDevelop.VersionControl.Git cred = new UsernamePasswordCredentials (); else { // Try ssh-agent on Linux. - if (SshAgentSupported (state)) { + if (!Platform.IsWindows && !state.AgentUsed) { bool agentUsable; if (!state.AgentForUrl.TryGetValue (url, out agentUsable)) state.AgentForUrl [url] = agentUsable = true; |