Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 337315 - NullPointer when pulling from a deleted local branch
Summary: NullPointer when pulling from a deleted local branch
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 0.12   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Stefan Lay CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-02-16 09:24 EST by Stefan Lay CLA
Modified: 2011-02-16 10:42 EST (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Stefan Lay CLA 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 CLA 2011-02-16 09:50:46 EST 
Fix proposed: http://egit.eclipse.org/r/#change,2514
Comment 2 Stefan Lay CLA 2011-02-16 10:42:20 EST 
Fixed with 68459b646e6c8243dc5650cbe08ce1bcdb8a621d