Merge "LogServlet: Handle HEAD symref to non-existent branch"
diff --git a/java/com/google/gitiles/LogServlet.java b/java/com/google/gitiles/LogServlet.java
index 71f7384..368fd0b 100644
--- a/java/com/google/gitiles/LogServlet.java
+++ b/java/com/google/gitiles/LogServlet.java
@@ -191,10 +191,14 @@
if (headRef == null) {
return null;
}
+ ObjectId id = headRef.getObjectId();
+ if (id == null) {
+ return null;
+ }
try (RevWalk walk = new RevWalk(repo)) {
return GitilesView.log()
.copyFrom(view)
- .setRevision(Revision.peel(Constants.HEAD, walk.parseAny(headRef.getObjectId()), walk))
+ .setRevision(Revision.peel(Constants.HEAD, walk.parseAny(id), walk))
.build();
}
}