Community
Participate
Working Groups
Steps: * Merge a branch * Get conflicts * Sync with MERGE_HEAD * Resolve conflicts * Add conflicting file * Commit (commit works) NPE happens: !ENTRY org.eclipse.core.jobs 4 2 2011-07-12 16:38:59.587 !MESSAGE An internal error occurred during: "Committing changes". !STACK 0 java.lang.NullPointerException at org.eclipse.jgit.lib.ObjectIdOwnerMap.get(ObjectIdOwnerMap.java:131) at org.eclipse.jgit.revwalk.RevWalk.lookupCommit(RevWalk.java:629) at org.eclipse.egit.core.RevUtils.getCommonAncestor(RevUtils.java:44) at org.eclipse.egit.core.synchronize.dto.GitSynchronizeData.updateRevs(GitSynchronizeData.java:135) at org.eclipse.egit.core.synchronize.GitSubscriberMergeContext.update(GitSubscriberMergeContext.java:100) at org.eclipse.egit.core.synchronize.GitSubscriberMergeContext.access$0(GitSubscriberMergeContext.java:95) at org.eclipse.egit.core.synchronize.GitSubscriberMergeContext$1.repositoryChanged(GitSubscriberMergeContext.java:52) at org.eclipse.egit.core.project.GitProjectData.fireRepositoryChanged(GitProjectData.java:143) at org.eclipse.egit.core.project.RepositoryMapping.fireRepositoryChanged(RepositoryMapping.java:171) at org.eclipse.egit.ui.internal.commit.CommitUI$2.run(CommitUI.java:228) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Google search lead me here, so I'll add this comment, I get the same exception when I try to synch a project attached to a branch I created. java.lang.NullPointerException at org.eclipse.jgit.lib.ObjectIdOwnerMap.get(ObjectIdOwnerMap.java:131) at org.eclipse.jgit.revwalk.RevWalk.lookupCommit(RevWalk.java:629) at org.eclipse.egit.core.RevUtils.getCommonAncestor(RevUtils.java:44) at org.eclipse.egit.core.synchronize.dto.GitSynchronizeData.updateRevs(GitSynchronizeData.java:149) at org.eclipse.egit.core.synchronize.dto.GitSynchronizeData.<init>(GitSynchronizeData.java:131) at org.eclipse.egit.ui.internal.actions.SynchronizeWorkspaceActionHandler.execute(SynchronizeWorkspaceActionHandler.java:65) at org.eclipse.egit.ui.internal.actions.RepositoryAction.run(RepositoryAction.java:86) at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginAction.java:251) at org.eclipse.jface.action.ActionContributionItem.handleWidgetSelection(ActionContributionItem.java:584) at org.eclipse.jface.action.ActionContributionItem.access$2(ActionContributionItem.java:501) at org.eclipse.jface.action.ActionContributionItem$5.handleEvent(ActionContributionItem.java:411) at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84) at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1053) at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4165) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3754) at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2701) at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2665) at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2499) at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:679) at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:668) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:123) at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:344) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:622) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:577) at org.eclipse.equinox.launcher.Main.run(Main.java:1410) at org.eclipse.equinox.launcher.Main.main(Main.java:1386)
