opendev/gerrit
Code Issues Proposed changes

Allow use theirs merge strategy to snap back to previous commit

Browse Source 
Normally, merge an merged commit is not allowed. However, there is a
special case that user want to snap back to an older commit but keep the
history. The way to do this is using `theirs` merge strategy to create a
merge change.

Change-Id: I93fbd7157c6f723d79728c7a8c95f3034b762716
This commit is contained in:
Zhen Chen
2016-09-15 11:22:26 -07:00
parent 27ce157cac
commit b786b937fa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -213,7 +213,8 @@ public class MergeUtil {
PersonIdent committerIndent, String commitMsg, RevWalk rw)
throws IOException, MergeIdenticalTreeException, MergeConflictException {
if (rw.isMergedInto(originalCommit, mergeTip)) {
if (!MergeStrategy.THEIRS.getName().equals(mergeStrategy) &&
rw.isMergedInto(originalCommit, mergeTip)) {
throw new ChangeAlreadyMergedException(
"'" + originalCommit.getName() + "' has already been merged");
}