Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 354176

Summary:	NPE when selecting Rebase... for projects in different repos
Product:	[Technology] EGit	Reporter:	Grant Gayed <grant_gayed>
Component:	UI	Assignee:	Kevin Sawicki <kevin>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	matthias.sohn
Version:	1.0
Target Milestone:	1.1-M2
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Grant Gayed

2011-08-08 15:33:35 EDT

EGit 1.0.0.201106090707-r with Eclipse 3.8M1

- retrieve projects from two different local git repositories into your workspace
- select both of the projects, right-click -> Replace With > HEAD Revision
- when it's done, with both projects still selected, right-click -> Team > Rebase...
- this fails and the following is written to the Error Log:

java.lang.NullPointerException
	at org.eclipse.egit.ui.internal.dialogs.BasicConfigurationDialog.loadRepoScopedConfig(BasicConfigurationDialog.java:108)
	at org.eclipse.egit.ui.internal.dialogs.BasicConfigurationDialog.isImplicitUserConfig(BasicConfigurationDialog.java:83)
	at org.eclipse.egit.ui.internal.dialogs.BasicConfigurationDialog.show(BasicConfigurationDialog.java:69)
	at org.eclipse.egit.ui.internal.commands.shared.RebaseCurrentRefCommand.execute(RebaseCurrentRefCommand.java:59)
	at org.eclipse.ui.internal.handlers.HandlerProxy.execute(HandlerProxy.java:293)
	at org.eclipse.core.commands.Command.executeWithChecks(Command.java:476)
	at org.eclipse.core.commands.ParameterizedCommand.executeWithChecks(ParameterizedCommand.java:508)
	at org.eclipse.ui.internal.handlers.HandlerService.executeCommand(HandlerService.java:169)
	at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
	at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
	at org.eclipse.ui.menus.CommandContributionItem.handleWidgetSelection(CommandContributionItem.java:829)
	at org.eclipse.ui.menus.CommandContributionItem.access$19(CommandContributionItem.java:815)
	at org.eclipse.ui.menus.CommandContributionItem$5.handleEvent(CommandContributionItem.java:805)
	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:2696)
	at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2660)
	at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2494)
	at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:674)
	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:667)
	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(NativeMethodAccessorImpl.java:48)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
	at java.lang.reflect.Method.invoke(Method.java:600)
	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)

Comment 1 Kevin Sawicki

2011-08-10 13:40:44 EDT

I'm assuming Rebase should be disabled on selections from different repositories
to be consistent with the Merge action does it disabled with that type of selection.

Comment 2 Matthias Sohn

2011-08-12 04:20:14 EDT

yeah, I think rebase should be disabled when multiple repositories are selected

Comment 3 Kevin Sawicki

2011-08-12 19:27:59 EDT

Proposed fix pushed to: http://egit.eclipse.org/r/#change,3994

Comment 4 Matthias Sohn

2011-08-14 19:33:01 EDT

merged as 107fdcd3f4fbfec6aeeb7bf01efcbb61df6fe2bb