opendev/gerrit
Code Issues Proposed changes

Merge "Notice merged changes even if they appear on a different branch"

Browse Source
This commit is contained in:
Dave Borowitz
2016-02-19 16:25:09 +00:00
committed by Gerrit Code Review
parent 8cd43dfe6d 0e9f31f379
commit 795b930d46
3 changed files with 142 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyListener.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.server.git.strategy;
import com.google.common.base.CharMatcher;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.api.changes.SubmitInput;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.reviewdb.client.Change;
@@ -24,6 +25,8 @@ import com.google.gerrit.server.git.CodeReviewCommit;
import com.google.gerrit.server.git.IntegrationException;
import com.google.gerrit.server.git.MergeOp.CommitStatus;
import org.eclipse.jgit.revwalk.RevCommit;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -86,8 +89,10 @@ public class SubmitStrategyListener extends BatchUpdate.Listener {
private void markCleanMerges() throws IntegrationException {
for (SubmitStrategy strategy : strategies) {
SubmitStrategy.Arguments args = strategy.args;
RevCommit initialTip = args.mergeTip.getInitialTip();
args.mergeUtil.markCleanMerges(args.rw, args.canMergeFlag,
args.mergeTip.getCurrentTip(), args.alreadyAccepted);
args.mergeTip.getCurrentTip(), initialTip == null ?
ImmutableSet.<RevCommit>of() : ImmutableSet.of(initialTip));
}
}