From f23580b9054c3041b41d9eba42b7457f217077be Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Wed, 5 Mar 2014 15:19:48 +0900
Subject: [PATCH] RFC: Work around null commit when updating submodules

Bug: Issue 2498
Change-Id: I5d82ead765bc743d3392a1333cd2c3fc4cf971c7
---
 .../main/java/com/google/gerrit/server/git/SubmoduleOp.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git 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
index eeab8f33d5..ca189a7c30 100644
--- 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
@@ -269,6 +269,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());