diff options
| author | Edwin Kempin <edwin.kempin@gmail.com> | 2014-06-02 13:35:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-02 13:35:53 +0000 |
| commit | 8023b5d9b6f22dd4d25f60896bdfeb99e39db779 (patch) | |
| tree | ece0d8dbb73dcbed96d942835645aa0afa4fd6ab | |
| parent | b182fc11de5cb85616d4ae7d1fd8f479b091f50b (diff) | |
| parent | facf9d55ec82b8cbec63203d2e244fe65f858a72 (diff) | |
Merge "Populate CodeReviewCommit before passing to MergeValidators" into stable-2.9v2.9-rc2
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index 0919aa0f67..d92400e02f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java @@ -520,6 +520,15 @@ public class MergeOp { continue; } + try { + commit.setControl(changeControlFactory.controlFor(chg, + identifiedUserFactory.create(chg.getOwner()))); + } catch (NoSuchChangeException e) { + throw new MergeException("Failed to validate changes", e); + } + commit.setPatchsetId(ps.getId()); + commit.originalOrder = commitOrder++; + MergeValidators mergeValidators = mergeValidatorsFactory.create(); try { mergeValidators.validatePreMerge(repo, commit, destProject, destBranch, ps.getId()); @@ -529,14 +538,6 @@ public class MergeOp { continue; } - try { - commit.setControl(changeControlFactory.controlFor(chg, - identifiedUserFactory.create(chg.getOwner()))); - } catch (NoSuchChangeException e) { - throw new MergeException("Failed to validate changes", e); - } - commit.setPatchsetId(ps.getId()); - commit.originalOrder = commitOrder++; commits.put(changeId, commit); if (branchTip != null) { |