opendev/gerrit
Code Issues Proposed changes

Merge "Always do Change-Id checks on receiving commits"

Browse Source
This commit is contained in:
Shawn Pearce
2011-01-09 16:06:39 -08:00
committed by Android Code Review
parent 9a5172246f 98417c312b
commit 0d5548d87f
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -1504,18 +1504,16 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
}
}
if (project.isRequireChangeID()) {
final List<String> idList = c.getFooterLines(CHANGE_ID);
if (idList.isEmpty()) {
reject(cmd, "missing Change-Id in commit message ");
final List<String> idList = c.getFooterLines(CHANGE_ID);
if (idList.isEmpty()) {
if (project.isRequireChangeID()) {
reject(cmd, "missing Change-Id in commit message");
return false;
}
if (idList.size() > 1) {
reject(cmd, "multiple Change-Id lines in commit message ");
return false;
}
} else if (idList.size() > 1) {
reject(cmd, "multiple Change-Id lines in commit message");
return false;
} else {
final String v = idList.get(idList.size() - 1).trim();
if (!v.matches("^I[0-9a-f]{8,}.*$")) {
reject(cmd, "invalid Change-Id line format in commit message ");