opendev/gerrit
Code Issues Proposed changes

Merge "Fix submitting changes with commits that were already merged"

Browse Source
This commit is contained in:
David Pursehouse
2017-01-11 11:10:02 +00:00
committed by Gerrit Code Review
parent eace44745f 3facbc6033
commit 0cc48e7c3f
2 changed files with 97 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

@@ -496,7 +496,8 @@ public class MergeUtil {
}
try {
return mergeTip == null || rw.isMergedInto(mergeTip, toMerge);
return mergeTip == null || rw.isMergedInto(mergeTip, toMerge)
|| rw.isMergedInto(toMerge, mergeTip);
} catch (IOException e) {
throw new IntegrationException("Cannot fast-forward test during merge", e);
}