opendev/gerrit
Code Issues Proposed changes

Pass recursive=true into config.getNames() JGit method

Browse Source 
This change solves the SSH aliasing. Without the parameters,
section content is not found.

Change-Id: I83acb53b8e919ea8cdd634eca1b66b04e6ef3107
This commit is contained in:
David Ostrovsky 2014-01-30 09:24:59 +01:00
parent 6b53357fa6
commit f33cbe4ed4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/MergeableFileBasedConfig.java
View File

@ -51,7 +51,7 @@ public class MergeableFileBasedConfig extends FileBasedConfig {
}
}
for (String name : s.getNames(section)) {
for (String name : s.getNames(section, true)) {
setStringList(section, null, name,
Lists.newArrayList(s.getStringList(section, null, name)));
}

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java
View File

@ -53,7 +53,7 @@ public class SshModule extends FactoryModule {
@Inject
SshModule(@GerritServerConfig Config cfg) {
aliases = Maps.newHashMap();
for (String name : cfg.getNames("ssh-alias")) {
for (String name : cfg.getNames("ssh-alias", true)) {
aliases.put(name, cfg.getString("ssh-alias", null, name));
}
}