diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-11-10 19:01:14 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-11-11 01:01:03 +0100 |
| commit | 19ef730d74d0bfff28cc1f5f8191188e45016c5c (patch) | |
| tree | 42d45baa97c79aa4670d7fed8bd8807f4dd6d78f /org.eclipse.jgit/resources | |
| parent | c7fffc30d090e3345e5360be01e2308605b33ef1 (diff) | |
| parent | f67af4e16b3adc0d2c14fa5e2fdc594975e7fe40 (diff) | |
| download | jgit-19ef730d74d0bfff28cc1f5f8191188e45016c5c.tar.gz jgit-19ef730d74d0bfff28cc1f5f8191188e45016c5c.zip | |
Merge branch 'stable-4.9'
* stable-4.9:
Work around a Jsch bug: ensure the user name is set from URI
Reintroduce protected method which removal broke EMF Compare
Change-Id: I335587eee279f91bd36c9ba9fc149b17a6db6110
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index d598f79235..481cebcaa2 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -611,6 +611,7 @@ sourceIsNotAWildcard=Source is not a wildcard. sourceRefDoesntResolveToAnyObject=Source ref {0} doesn''t resolve to any object. sourceRefNotSpecifiedForRefspec=Source ref not specified for refspec: {0} squashCommitNotUpdatingHEAD=Squash commit -- not updating HEAD +sshUserNameError=Jsch error: failed to set SSH user name correctly to ''{0}''; using ''{1}'' picked up from SSH config file. sslFailureExceptionMessage=Secure connection to {0} could not be stablished because of SSL problems sslFailureInfo=A secure connection to {0}\ncould not be established because the server''s certificate could not be validated. sslFailureCause=SSL reported: {0} |