opendev/gerrit
Code Issues Proposed changes

AutoMerger: Check reader was created from inserter

Browse Source 
Change-Id: I7f9615d98296ebf1544236f4f6cd3eeaa5c2c975
This commit is contained in:
Dave Borowitz
2016-06-24 10:09:51 -04:00
parent 250e50f142
commit 8505c8df0a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/AutoMerger.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.patch; package com.google.gerrit.server.patch;
import static com.google.common.base.Preconditions.checkArgument;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.RefNames;
@@ -73,6 +74,7 @@ public class AutoMerger {
public RevCommit merge(Repository repo, RevWalk rw, final ObjectInserter ins, public RevCommit merge(Repository repo, RevWalk rw, final ObjectInserter ins,
RevCommit merge, ThreeWayMergeStrategy mergeStrategy) RevCommit merge, ThreeWayMergeStrategy mergeStrategy)
throws IOException { throws IOException {
checkArgument(rw.getObjectReader().getCreatedFromInserter() == ins);
rw.parseHeaders(merge); rw.parseHeaders(merge);
String hash = merge.name(); String hash = merge.name();
String refName = RefNames.REFS_CACHE_AUTOMERGE String refName = RefNames.REFS_CACHE_AUTOMERGE