opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6'

Browse Source 
* stable-2.6:
  Clearer error message when Change-Id line not found
  Fix parameter checking on ls-projects command
  Add LDAP Groups section to docs

Change-Id: I38b1979a72d7327bfb41cc0a676123c4a238c330
This commit is contained in:
David Pursehouse
2013-04-16 18:34:14 +09:00
parent d168b81bbb 871670b3dc
commit e6832aee80
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/access-control.txt
View File

@@ -134,6 +134,17 @@ This configuration can help prevent accidental submits when the
members of `Foo` have submit rights on a project, and the members of
`Foo-admin` typically do not need to have such rights.
[[ldap_groups]]
LDAP Groups
-----------
LDAP groups are Account Groups that are maintained inside of your
LDAP instance. If you are using LDAP to manage your groups they will
not appear in the Groups list. However you can use them just like
regular Account Groups by prefixing your group with "ldap/" in the
Access Control for a project. For example "ldap/foo-project" will
add the LDAP "foo-project" group to the access list.
Project Access Control Lists
----------------------------

8
Documentation/user-changeid.txt
View File

@@ -10,10 +10,10 @@ drafts of it. By including a unique Change-Id in the commit message,
Gerrit can automatically associate a new version of a change back
to its original review, even across cherry-picks and rebases.
To be picked up by Gerrit, a Change-Id line must be in the bottom
portion (last paragraph) of a commit message, and may be mixed
together with the Signed-off-by, Acked-by, or other such footers.
For example:
To be picked up by Gerrit, a Change-Id line must be in the footer
(last paragraph) of a commit message, and may be mixed
together with link:user-signedoffby.html[Signed-off-by], Acked-by,
or other such lines. For example:
----
$ git log -1

3
gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
View File

@@ -486,7 +486,8 @@ public class CommitValidators {
sb.append('\n');
sb.append(changeId).append(" I").append(c.name());
sb.append('\n');
sb.append("Hint: A potential Change-Id was found, but it was not in the footer of the commit message.");
sb.append("Hint: A potential Change-Id was found, but it was not in the ");
sb.append("footer (last paragraph) of the commit message.");
}
}
sb.append('\n');

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java
View File

@@ -21,6 +21,8 @@ import com.google.inject.Inject;
import org.apache.sshd.server.Environment;
import java.util.List;
@CommandMetaData(name = "ls-projects", descr = "List projects visible to the caller")
final class ListProjectsCommand extends BaseCommand {
@Inject
@@ -33,7 +35,8 @@ final class ListProjectsCommand extends BaseCommand {
public void run() throws Exception {
parseCommandLine(impl);
if (!impl.getFormat().isJson()) {
if (impl.isShowTree() && (impl.getShowBranch() != null)) {
List<String> showBranch = impl.getShowBranch();
if (impl.isShowTree() && (showBranch != null) && !showBranch.isEmpty()) {
throw new UnloggedFailure(1, "fatal: --tree and --show-branch options are not compatible.");
}
if (impl.isShowTree() && impl.isShowDescription()) {