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

Bug 337315

Summary:	NullPointer when pulling from a deleted local branch
Product:	[Technology] EGit	Reporter:	Stefan Lay <stefan.lay>
Component:	Core	Assignee:	Stefan Lay <stefan.lay>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3
Version:	0.12
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description Stefan Lay

2011-02-16 09:24:58 EST

I hve a local branch A which had been created from another local branch B. Branch B was deleted. When A is checked out and I select the pull action I get

java.lang.NullPointerException
	at org.eclipse.jgit.api.MergeCommand.include(MergeCommand.java:317)
	at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:277)
	at org.eclipse.egit.core.op.PullOperation$1.run(PullOperation.java:68)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1800)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1782)
	at org.eclipse.egit.core.op.PullOperation.execute(PullOperation.java:77)
	at org.eclipse.egit.ui.internal.repository.tree.command.PullCommand$1.run(PullCommand.java:66)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)

Comment 1 Stefan Lay

2011-02-16 09:50:46 EST

Fix proposed: http://egit.eclipse.org/r/#change,2514

Comment 2 Stefan Lay

2011-02-16 10:42:20 EST

Fixed with 68459b646e6c8243dc5650cbe08ce1bcdb8a621d