Internal Error Displaying Merge

[Miles Rausch]

In our private Gitblit install, we've been having issues displaying some merges. One in particular is titled: Merge remote-tracking branch 'origin/master'. Clicking the "view" and "diff" links for the merge produce the error pasted below. Clicking the "tree" link does not produce an error; it produces the full repository tree, and I think the tree is accurate to the time of the merge. The reason we're keen to see the diff is that some code was reverted during this merge, and we'd like an easy way to see what files were actually changed.

We're running Gitblit 1.1.0. We usually run Gitblit as a service on Windows Server, but we did switch to the cmd version to get the error output. If you need any other details, please let me know.

Thanks!

ERROR Error attaching this container for rendering: [Page class = com.gitblit.wi

cket.pages.CommitPage, id = 0, version = 0]

org.apache.wicket.WicketRuntimeException: Error attaching this container for ren

dering: [Page class = com.gitblit.wicket.pages.CommitPage, id = 0, version = 0]

        at org.apache.wicket.MarkupContainer.onBeforeRenderChildren(MarkupContai

ner.java:1789)

        at org.apache.wicket.Component.onBeforeRender(Component.java:4001)

        at org.apache.wicket.Page.onBeforeRender(Page.java:1555)

        at com.gitblit.wicket.pages.BasePage.onBeforeRender(BasePage.java:107)

        at com.gitblit.wicket.pages.RepositoryPage.onBeforeRender(RepositoryPage

.java:393)

        at org.apache.wicket.Component.internalBeforeRender(Component.java:1069)

        at org.apache.wicket.Component.beforeRender(Component.java:1103)

        at org.apache.wicket.Component.prepareForRender(Component.java:2297)

        at org.apache.wicket.Page.prepareForRender(Page.java:1545)

        at org.apache.wicket.Component.prepareForRender(Component.java:2329)

        at org.apache.wicket.Page.renderPage(Page.java:912)

        at org.apache.wicket.request.target.component.BookmarkablePageRequestTar

get.respond(BookmarkablePageRequestTarget.java:261)

        at org.apache.wicket.request.AbstractRequestCycleProcessor.respond(Abstr

actRequestCycleProcessor.java:105)

        at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.j

ava:1287)

        at org.apache.wicket.RequestCycle.step(RequestCycle.java:1358)

        at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1465)

        at org.apache.wicket.RequestCycle.request(RequestCycle.java:545)

        at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:

486)

        at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.ja

va:319)

        at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(Servlet

Handler.java:1323)

        at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java

:476)

        at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.j

ava:119)

        at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.jav

a:517)

        at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandl

er.java:225)

        at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandl

er.java:937)

        at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:

406)

        at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandle

r.java:183)

        at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandle

r.java:871)

        at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.j

ava:117)

        at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper

.java:110)

        at org.eclipse.jetty.server.Server.handle(Server.java:346)

        at org.eclipse.jetty.server.HttpConnection.handleRequest(HttpConnection.

java:589)

        at org.eclipse.jetty.server.HttpConnection$RequestHandler.headerComplete

(HttpConnection.java:1048)

        at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:601)

        at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:214)

        at org.eclipse.jetty.server.HttpConnection.handle(HttpConnection.java:41

1)

        at org.eclipse.jetty.io.nio.SelectChannelEndPoint.handle(SelectChannelEn

dPoint.java:535)

        at org.eclipse.jetty.io.nio.SelectChannelEndPoint$1.run(SelectChannelEnd

Point.java:40)

        at org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool

.java:529)

        at java.lang.Thread.run(Unknown Source)

Caused by: java.lang.NullPointerException

        at com.gitblit.wicket.pages.RepositoryPage.getShortObjectId(RepositoryPa

ge.java:302)

        at com.gitblit.wicket.pages.CommitPage$3.populateItem(CommitPage.java:16

9)

        at org.apache.wicket.markup.repeater.RefreshingView$1.newItem(Refreshing

View.java:114)

        at org.apache.wicket.markup.repeater.DefaultItemReuseStrategy$1.next(Def

aultItemReuseStrategy.java:71)

        at org.apache.wicket.markup.repeater.DefaultItemReuseStrategy$1.next(Def

aultItemReuseStrategy.java:68)

        at org.apache.wicket.markup.repeater.RefreshingView.addItems(RefreshingV

iew.java:189)

        at org.apache.wicket.markup.repeater.RefreshingView.onPopulate(Refreshin

gView.java:98)

        at org.apache.wicket.markup.repeater.AbstractRepeater.onBeforeRender(Abs

tractRepeater.java:131)

        at org.apache.wicket.markup.repeater.AbstractPageableView.onBeforeRender

(AbstractPageableView.java:121)

        at org.apache.wicket.Component.internalBeforeRender(Component.java:1069)

        at org.apache.wicket.Component.beforeRender(Component.java:1103)

        at org.apache.wicket.MarkupContainer.onBeforeRenderChildren(MarkupContai

ner.java:1777)

        ... 39 more

[James Moger]

This is the same as issue-178 and same as the this just-reported thread:
https://groups.google.com/forum/?fromgroups=#!topic/gitblit/5N9jq0brxtg

The commit in question has an unexpected submodule reference.
Is your repo cloneable so that I can see why the submodule reference is null?

This could be a one-line fix, but without an example repo I'm just shooting in the dark.

-J

[Miles Rausch]

I think we have the same issue a lot of places have in that this code in question is private so we can't really share any details. We have a new project coming up where we might also use git submodules, and I'll let you know if we have the issue again, hopefully with more detail. Honestly, I was having bad luck with our Git client, and that might have been part of the issue, too.

Thanks!

Miles Rausch

--

Miles Rausch
http://www.milesrausch.com
http://www.awayken.com
http://www.newsbleep.com