Merge branch 'stable-5.12'
* stable-5.12:
Update Orbit to R20210602031627
Prepare 5.12.0-SNAPSHOT builds
JGit v5.12.0.202106021050-rc1
Prepare 5.12.0-SNAPSHOT builds
JGit v5.12.0.202106011439-rc1
Prepare 5.12.0-SNAPSHOT builds
JGit v5.12.0.202105261145-m3
Change-Id: Iaf5d65a6e23c4d262fcb3dd3eda42bd634a38aad
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java
index bf93d77..228c25f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java
@@ -482,12 +482,18 @@
private final List<String> patterns;
- // Constructor used to build the merged entry; never matches anything
- HostEntry() {
+ /**
+ * Constructor used to build the merged entry; never matches anything
+ */
+ public HostEntry() {
this.patterns = Collections.emptyList();
}
- HostEntry(List<String> patterns) {
+ /**
+ * @param patterns
+ * to be used in matching against host name.
+ */
+ public HostEntry(List<String> patterns) {
this.patterns = patterns;
}
@@ -881,8 +887,8 @@
public String substitute(String input, String allowed,
boolean withEnv) {
if (input == null || input.length() <= 1
- || input.indexOf('%') < 0
- && (!withEnv || input.indexOf("${") < 0)) { //$NON-NLS-1$
+ || (input.indexOf('%') < 0
+ && (!withEnv || input.indexOf("${") < 0))) { //$NON-NLS-1$
return input;
}
StringBuilder builder = new StringBuilder();
