From f33cbe4ed4d1378c8ab02e4d7c9ad2e6a4562a78 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 30 Jan 2014 09:24:59 +0100 Subject: [PATCH] Pass recursive=true into config.getNames() JGit method This change solves the SSH aliasing. Without the parameters, section content is not found. Change-Id: I83acb53b8e919ea8cdd634eca1b66b04e6ef3107 --- .../com/google/gerrit/acceptance/MergeableFileBasedConfig.java | 2 +- gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/MergeableFileBasedConfig.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/MergeableFileBasedConfig.java index f1baa9d269..3b59d28bcc 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/MergeableFileBasedConfig.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/MergeableFileBasedConfig.java @@ -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))); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java index 39b7f16da8..c1c0ff5610 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java @@ -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)); } }