Skip to content

The Unified and Autonomous Development Platform

Add to logic to handle the case when ref update points to non-commit object

Robin Shen9cd1f3e37afd
diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java b/gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java
index e32bbdbe8f..eab07294de 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java
@@ -10,15 +10,15 @@ public class RefUpdated {
private final String refName;
- private final ObjectId oldCommit;
+ private final ObjectId oldObjectId;
- private final ObjectId newCommit;
+ private final ObjectId newObjectId;
- public RefUpdated(Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ public RefUpdated(Depot depot, String refName, ObjectId oldObjectId, ObjectId newObjectId) {
this.depot = depot;
this.refName = refName;
- this.oldCommit = oldCommit;
- this.newCommit = newCommit;
+ this.oldObjectId = oldObjectId;
+ this.newObjectId = newObjectId;
}
public Depot getDepot() {
@@ -29,12 +29,12 @@ public class RefUpdated {
return refName;
}
- public ObjectId getOldCommit() {
- return oldCommit;
+ public ObjectId getOldObjectId() {
+ return oldObjectId;
}
- public ObjectId getNewCommit() {
- return newCommit;
+ public ObjectId getNewObjectId() {
+ return newObjectId;
}
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java
index 073062c4e9..03d634cad0 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java
@@ -48,9 +48,10 @@ public abstract class AbstractGateKeeper implements GateKeeper {
}
@Override
- public GateCheckResult checkPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ public GateCheckResult checkPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
if (isEnabled())
- return doCheckPush(user, depot, refName, oldCommit, newCommit);
+ return doCheckPush(user, depot, refName, oldObjectId, newObjectId);
else
return ignored();
}
@@ -92,7 +93,8 @@ public abstract class AbstractGateKeeper implements GateKeeper {
* @return
* result of the check
*/
- protected abstract GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit);
+ protected abstract GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId);
protected GateCheckResult ignored() {
return new Ignored();
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java
index 478b726382..9872a70177 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java
@@ -65,7 +65,8 @@ public class ApprovedBySpecifiedTeam extends TeamAwareGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
return pending(Lists.newArrayList("Need to be approved by at least " + getLeastApprovals()
+ " member(s) of team " + getTeamName()));
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java
index d07a5b09cd..a3396475db 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java
@@ -58,7 +58,8 @@ public class ApprovedBySpecifiedUser extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
Account approveUser = Preconditions.checkNotNull(GitPlex.getInstance(AccountManager.class).findByName(userName));
return pending(Lists.newArrayList("Need approval from " + approveUser.getDisplayName()));
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java
index 44a574c3f6..01b8aa2a6d 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java
@@ -43,12 +43,12 @@ public abstract class CompositeGateKeeper extends AbstractGateKeeper {
@Override
protected GateCheckResult doCheckPush(final Account user, final Depot depot, final String refName,
- final ObjectId oldCommit, final ObjectId newCommit) {
+ final ObjectId oldObjectId, final ObjectId newObjectId) {
return aggregate(new Checker() {
@Override
public GateCheckResult check(GateKeeper gateKeeper) {
- return gateKeeper.checkPush(user, depot, refName, oldCommit, newCommit);
+ return gateKeeper.checkPush(user, depot, refName, oldObjectId, newObjectId);
}
});
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java
index e2f114596d..d1d6129992 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java
@@ -24,7 +24,8 @@ public class DefaultGateKeeper extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
return ignored();
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java
index 45c9944b61..4f382531d3 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java
@@ -62,8 +62,8 @@ public class DisapprovedBySpecifiedTeam extends TeamAwareGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit,
- ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldObjectId,
+ ObjectId newObjectId) {
return failed(Lists.newArrayList("Not disapproved by anyone from team " + getTeamName()));
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java
index a7da861b3f..deb7d6c840 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java
@@ -53,8 +53,8 @@ public class DisapprovedBySpecifiedUser extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit,
- ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
return failed(Lists.newArrayList("Not disapproved by " + userName));
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java
index 637920e6cb..a34677e21b 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java
@@ -54,14 +54,14 @@ public interface GateKeeper extends Serializable {
* user to be checked
* @param refName
* refName to be checked
- * @param oldCommitHash
- * old commit of the ref
- * @param newCommitHash
- * new commit of the ref
+ * @param oldObjectId
+ * old object id of the ref
+ * @param newObjectId
+ * new object id of the ref
* @return
* result of the check
*/
- GateCheckResult checkPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit);
+ GateCheckResult checkPush(Account user, Depot depot, String refName, ObjectId oldObjectId, ObjectId newObjectId);
void onDepotRename(Depot renamedDepot, String oldName);
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java
index 5449d9d528..05eb43d016 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java
@@ -81,8 +81,9 @@ public class PerformSpecifiedOperations extends AbstractGateKeeper implements Va
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
- if (oldCommit.equals(ObjectId.zeroId())) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
+ if (oldObjectId.equals(ObjectId.zeroId())) {
if (createRef) {
return passed(Lists.newArrayList("Trying to create a ref"));
}
@@ -94,7 +95,7 @@ public class PerformSpecifiedOperations extends AbstractGateKeeper implements Va
reasons.add("Trying to delete a ref");
}
return failed(reasons);
- } else if (newCommit.equals(ObjectId.zeroId())) {
+ } else if (newObjectId.equals(ObjectId.zeroId())) {
if (deleteRef) {
return passed(Lists.newArrayList("Trying to delete a ref"));
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java
index 596fa67cbd..ab92aab7f1 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java
@@ -1,13 +1,16 @@
package com.gitplex.core.gatekeeper;
+import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.core.entity.Account;
import com.gitplex.core.entity.Depot;
import com.gitplex.core.entity.PullRequest;
import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.util.ExceptionUtils;
import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(order=2000, icon="fa-ext fa-repo-lock", description="This gatekeeper will be passed if the push "
@@ -29,12 +32,21 @@ public class PushWithoutRewritingHistory extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
- if (!oldCommit.equals(ObjectId.zeroId()) && !newCommit.equals(ObjectId.zeroId())) {
- if (GitUtils.isMergedInto(depot.getRepository(), oldCommit, newCommit))
- return passed(Lists.newArrayList("Not trying to rewrite history"));
- else
- return failed(Lists.newArrayList("Trying to rewrite history"));
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
+ if (!oldObjectId.equals(ObjectId.zeroId()) && !newObjectId.equals(ObjectId.zeroId())) {
+ try {
+ if (GitUtils.isMergedInto(depot.getRepository(), oldObjectId, newObjectId)) {
+ return passed(Lists.newArrayList("Not trying to rewrite history"));
+ } else {
+ return failed(Lists.newArrayList("Trying to rewrite history"));
+ }
+ } catch (Exception e) {
+ if (ExceptionUtils.find(e, IncorrectObjectTypeException.class) != null)
+ return ignored();
+ else
+ throw Throwables.propagate(e);
+ }
} else {
return ignored();
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java
index 15034f7b58..45c0e89860 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java
@@ -42,7 +42,8 @@ public class SubmitWithGerritStylePatch extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
return ignored();
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java
index f337201234..7bde5eff77 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java
@@ -32,7 +32,7 @@ public class SubmittedBySpecifiedTeam extends TeamAwareGateKeeper {
@Override
protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
- ObjectId oldCommit, ObjectId newCommit) {
+ ObjectId oldObjectId, ObjectId newObjectId) {
return checkSubmitter(user, depot.getAccount());
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java
index 42419f4ece..026244dab1 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java
@@ -52,7 +52,8 @@ public class SubmittedBySpecifiedUser extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
return checkSubmitter(user);
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java
index eafc318f8a..c58baf0285 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java
@@ -34,7 +34,8 @@ public class TargetBranchIsMerged extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
return ignored();
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java
index 8519ced01d..abc5bb6352 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java
@@ -3,6 +3,7 @@ package com.gitplex.core.gatekeeper;
import java.io.IOException;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.hibernate.validator.constraints.NotEmpty;
@@ -74,13 +75,20 @@ public class TouchSpecifiedFiles extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
- if (!oldCommit.equals(ObjectId.zeroId()) && !newCommit.equals(ObjectId.zeroId())) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
+ if (!oldObjectId.equals(ObjectId.zeroId()) && !newObjectId.equals(ObjectId.zeroId())) {
try (TreeWalk treeWalk = new TreeWalk(depot.getRepository())) {
treeWalk.setFilter(TreeFilter.ANY_DIFF);
treeWalk.setRecursive(true);
- treeWalk.addTree(depot.getRevCommit(oldCommit).getTree());
- treeWalk.addTree(depot.getRevCommit(newCommit).getTree());
+ RevCommit oldCommit = depot.getRevCommit(oldObjectId, false);
+ if (oldCommit == null)
+ return ignored();
+ RevCommit newCommit = depot.getRevCommit(newObjectId, false);
+ if (newCommit == null)
+ return ignored();
+ treeWalk.addTree(oldCommit.getTree());
+ treeWalk.addTree(newCommit.getTree());
while (treeWalk.next()) {
if (matches(treeWalk.getPathString()))
return passed(Lists.newArrayList("Touched files match '" + pathMatch + "'"));
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java
index 9ebd30dc01..39b9240920 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java
@@ -59,7 +59,8 @@ public class TouchSpecifiedRefs extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
return doCheck(refName);
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java
index 5826f84bce..9f3d2130a5 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java
@@ -97,8 +97,9 @@ public class VerifiedByBuilds extends AbstractGateKeeper {
}
@Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
- if (!oldCommit.equals(ObjectId.zeroId()) && !newCommit.equals(ObjectId.zeroId())) {
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName,
+ ObjectId oldObjectId, ObjectId newObjectId) {
+ if (!oldObjectId.equals(ObjectId.zeroId()) && !newObjectId.equals(ObjectId.zeroId())) {
return pending(Lists.newArrayList("Has to be verified by builds"));
} else {
return ignored();
diff --git a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java
index 6499bd81ca..880ccc9446 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java
@@ -94,15 +94,15 @@ public class GitPostReceiveCallback extends HttpServlet {
while (true) {
String refName = StringUtils.reverse(fields.get(pos));
pos++;
- ObjectId newCommit = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));
+ ObjectId newObjectId = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));
pos++;
String field = fields.get(pos);
- ObjectId oldCommit = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));
+ ObjectId oldObjectId = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));
- if (!newCommit.equals(ObjectId.zeroId())) {
- depot.cacheObjectId(refName, newCommit);
+ if (!newObjectId.equals(ObjectId.zeroId())) {
+ depot.cacheObjectId(refName, newObjectId);
} else {
- newCommit = ObjectId.zeroId();
+ newObjectId = ObjectId.zeroId();
depot.cacheObjectId(refName, null);
}
@@ -112,7 +112,7 @@ public class GitPostReceiveCallback extends HttpServlet {
GitUtils.linkRef(refUpdate, refName);
}
- listenerRegistry.post(new RefUpdated(depot, refName, oldCommit, newCommit));
+ listenerRegistry.post(new RefUpdated(depot, refName, oldObjectId, newObjectId));
field = field.substring(40);
if (field.length() == 0)
diff --git a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java
index 4c3e9eab4e..2da077d786 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java
@@ -98,10 +98,10 @@ public class GitPreReceiveCallback extends HttpServlet {
while (true) {
String refName = StringUtils.reverse(fields.get(pos));
pos++;
- ObjectId newCommit = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));
+ ObjectId newObjectId = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));
pos++;
String field = fields.get(pos);
- ObjectId oldCommit = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));
+ ObjectId oldObjectId = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));
Account user = userManager.getCurrent();
Preconditions.checkNotNull(user);
@@ -113,14 +113,14 @@ public class GitPreReceiveCallback extends HttpServlet {
}
} else {
GateKeeper gateKeeper = depot.getGateKeeper();
- GateCheckResult checkResult = gateKeeper.checkPush(user, depot, refName, oldCommit, newCommit);
+ GateCheckResult checkResult = gateKeeper.checkPush(user, depot, refName, oldObjectId, newObjectId);
if (!checkResult.isPassedOrIgnored()) {
List<String> messages = new ArrayList<>();
for (String each: checkResult.getReasons())
messages.add(each);
if (GitUtils.ref2branch(refName) != null
- && !oldCommit.equals(ObjectId.zeroId())
- && !newCommit.equals(ObjectId.zeroId())
+ && !oldObjectId.equals(ObjectId.zeroId())
+ && !newObjectId.equals(ObjectId.zeroId())
&& !(checkResult instanceof Failed)) {
messages.add("");
messages.add("----------------------------------------------------");
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java
index 792d17cda2..04da67e433 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java
@@ -571,9 +571,12 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
@Listen
public void on(RefUpdated event) {
- if (!event.getNewCommit().equals(ObjectId.zeroId())) {
- CollectingWork refUpdate = new CollectingWork(PRIORITY, event.getNewCommit());
- batchWorkManager.submit(getBatchWorker(event.getDepot()), refUpdate);
+ if (!event.getNewObjectId().equals(ObjectId.zeroId())) {
+ RevCommit commit = event.getDepot().getRevCommit(event.getNewObjectId(), false);
+ if (commit != null) {
+ CollectingWork refUpdate = new CollectingWork(PRIORITY, commit.getId());
+ batchWorkManager.submit(getBatchWorker(event.getDepot()), refUpdate);
+ }
}
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java
index 970dd33431..eb008d3640 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java
@@ -335,7 +335,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
@Transactional
@Listen
public void on(RefUpdated event) {
- if (event.getNewCommit().equals(ObjectId.zeroId())) {
+ if (event.getNewObjectId().equals(ObjectId.zeroId())) {
String branch = GitUtils.ref2branch(event.getRefName());
for (Depot each: findAll()) {
if (branch != null) {
diff --git a/gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java b/gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java
index 8f1845936d..26d5c312bc 100644
--- a/gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java
@@ -402,8 +402,8 @@ public class DefaultIndexManager implements IndexManager {
public void on(RefUpdated event) {
// only index branches at back end, tags will be indexed on demand from GUI
// as many tags might be pushed all at once when the repository is imported
- if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewCommit().equals(ObjectId.zeroId())) {
- IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewCommit());
+ if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewObjectId().equals(ObjectId.zeroId())) {
+ IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewObjectId());
batchWorkManager.submit(getBatchWorker(event.getDepot()), work);
}
}