opendev/gerrit
Code Issues Proposed changes

Merge "Ignore new-change-for-all-not-in-target for root commit"

Browse Source
This commit is contained in:
Edwin Kempin
2014-09-12 10:12:01 +00:00
committed by Gerrit Code Review
parent 0f8fcab555 c391fc8489
commit afae7d5936
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1304,9 +1304,11 @@ public class ReceiveCommits {
return;
}
// If tip is a merge commit or %base was specified,
// ignore newChangeForAllNotInTarget
if (tip.getParentCount() > 1 || magicBranch.base != null) {
// If tip is a merge commit, or the root commit or
// if %base was specified, ignore newChangeForAllNotInTarget
if (tip.getParentCount() > 1
|| magicBranch.base != null
|| tip.getParentCount() == 0) {
newChangeForAllNotInTarget = false;
}