Merge branch 'stable-3.6' into stable-3.7
* stable-3.6:
Reverse the order of storing commit, tree and blobs
Change-Id: I8046f84e54ff3dea960f022528e896e8f439e629
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/fetch/ApplyObject.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/fetch/ApplyObject.java
index 36356e9..05033b4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/fetch/ApplyObject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/fetch/ApplyObject.java
@@ -61,10 +61,6 @@
throw new MissingParentObjectException(name, refSpec.getSource(), parent.getId());
}
}
- refHead = newObjectID = oi.insert(commitObject.getType(), commitObject.getContent());
-
- RevisionObjectData treeObject = revisionData.getTreeObject();
- oi.insert(treeObject.getType(), treeObject.getContent());
}
for (RevisionObjectData rev : revisionData.getBlobs()) {
@@ -75,6 +71,13 @@
refHead = newObjectID;
}
+ if (commitObject != null) {
+ RevisionObjectData treeObject = revisionData.getTreeObject();
+ oi.insert(treeObject.getType(), treeObject.getContent());
+
+ refHead = oi.insert(commitObject.getType(), commitObject.getContent());
+ }
+
oi.flush();
if (commitObject == null) {
