commit 491170364a1ae119ee0c44216dbd53e5ff5d6c83
author Dave Borowitz <dborowitz@google.com> Tue Feb 14 15:36:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 14 15:36:47 2017 +0000
tree 6e2e8034be7ec0d6ce88ecc1b05f3cbb6e08a80a
parent b5a4bbe88837b15c05623cf51899416be15644ec
parent acb51551fd9bbd2e04e7ae1de04ebe67e920cca4

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

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

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index 1206156..e4bc86f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -658,12 +658,14 @@
     }
 
     // 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();