diff options
Diffstat (limited to 'java/com/google/gerrit/server/submit/FastForwardOp.java')
-rw-r--r-- | java/com/google/gerrit/server/submit/FastForwardOp.java | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/java/com/google/gerrit/server/submit/FastForwardOp.java b/java/com/google/gerrit/server/submit/FastForwardOp.java new file mode 100644 index 0000000000..08f5abb06d --- /dev/null +++ b/java/com/google/gerrit/server/submit/FastForwardOp.java @@ -0,0 +1,39 @@ +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.server.submit; + +import static com.google.gerrit.server.submit.CommitMergeStatus.EMPTY_COMMIT; + +import com.google.gerrit.reviewdb.client.BooleanProjectConfig; +import com.google.gerrit.server.git.CodeReviewCommit; +import com.google.gerrit.server.update.RepoContext; + +class FastForwardOp extends SubmitStrategyOp { + FastForwardOp(SubmitStrategy.Arguments args, CodeReviewCommit toMerge) { + super(args, toMerge); + } + + @Override + protected void updateRepoImpl(RepoContext ctx) throws IntegrationException { + if (args.project.is(BooleanProjectConfig.REJECT_EMPTY_COMMIT) + && toMerge.getParentCount() > 0 + && toMerge.getTree().equals(toMerge.getParent(0).getTree())) { + toMerge.setStatusCode(EMPTY_COMMIT); + return; + } + + args.mergeTip.moveTipTo(toMerge, toMerge); + } +} |