opendev/gerrit
Code Issues Proposed changes

Merge "Do not invoke SubmoduleOp when no direct push in ReceiveCommits"

Browse Source
This commit is contained in:
Dave Borowitz
2017-02-14 15:36:46 +00:00
committed by Gerrit Code Review
parent b5a4bbe888 acb51551fd
commit 491170364a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -658,12 +658,14 @@ public class ReceiveCommits {
}
// Update superproject gitlinks if required.
try (MergeOpRepoManager orm = ormProvider.get()) {
orm.setContext(db, TimeUtil.nowTs(), user, receiveId);
SubmoduleOp op = subOpFactory.create(branches, orm);
op.updateSuperProjects();
} catch (SubmoduleException e) {
logError("Can't update the superprojects", e);
if (!branches.isEmpty()) {
try (MergeOpRepoManager orm = ormProvider.get()) {
orm.setContext(db, TimeUtil.nowTs(), user, receiveId);
SubmoduleOp op = subOpFactory.create(branches, orm);
op.updateSuperProjects();
} catch (SubmoduleException e) {
logError("Can't update the superprojects", e);
}
}
closeProgress.end();