Merge "RFC: Work around null commit when updating submodules" into stable-2.8

2014-03-06 20:04:42 +00:00
parent 4ff18054a2 f23580b905
commit 6ff6418736
1 changed files with 3 additions and 0 deletions
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
@@ -268,6 +268,9 @@ public class SubmoduleOp {

      for (final Map.Entry<Branch.NameKey, ObjectId> me : modules.entrySet()) {
        RevCommit c = myRw.parseCommit(me.getValue());
+        if (c == null) {
+          continue;
+        }

        msgbuf.append("\nProject: ");
        msgbuf.append(me.getKey().getParentKey().get());