This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 243417

Summary: NullPointerException at org.netbeans.modules.git.ui.fetch.PullBranchesStep.markMergingBranch
Product: versioncontrol Reporter: Exceptions Reporter <exceptions_reporter>
Component: GitAssignee: Ondrej Vrabec <ovrabec>
Status: RESOLVED FIXED    
Severity: normal CC: git
Priority: P3    
Version: 8.0   
Hardware: All   
OS: All   
Issue Type: DEFECT Exception Reporter: 208821
Attachments: stacktrace

Description Exceptions Reporter 2014-03-31 17:49:18 UTC 
This bug was originally marked as duplicate of bug 198644, that is already resolved. This bug is still valid, so this seems to be another bug, but it might be related.

Build: NetBeans IDE 8.0 (Build 201403101706)
VM: Java HotSpot(TM) 64-Bit Server VM, 24.45-b08, Java(TM) SE Runtime Environment, 1.7.0_45-b18
OS: Windows 8

User Comments:
GUEST: Cloning repo via ssh. On the repository are two branches and I selected both.




Stacktrace: 
java.lang.NullPointerException
   at org.netbeans.modules.git.ui.fetch.PullBranchesStep.markMergingBranch(PullBranchesStep.java:242)
   at org.netbeans.modules.git.ui.fetch.PullBranchesStep.stateChanged(PullBranchesStep.java:207)
   at org.openide.util.ChangeSupport.fireChange(ChangeSupport.java:133)
   at org.openide.util.ChangeSupport.fireChange(ChangeSupport.java:119)
   at org.netbeans.modules.git.ui.selectors.ItemSelector.switchSelection(ItemSelector.java:244)
   at org.netbeans.modules.git.ui.selectors.ItemSelector.access$100(ItemSelector.java:75)
Comment 1 Exceptions Reporter 2014-03-31 17:49:20 UTC 
Created attachment 146444 [details]
stacktrace
Comment 2 Ondrej Vrabec 2014-04-04 09:18:34 UTC 
fixed: core-main #72de8be3ffa2
Comment 3 Quality Engineering 2014-04-05 03:29:36 UTC 
Integrated into 'main-silver', will be available in build *201404050001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/72de8be3ffa2
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Issue #243417 - NullPointerException at org.netbeans.modules.git.ui.fetch.PullBranchesStep.markMergingBranch
When doing a pull right after git init (the local repository does not have any commit yet) current branch is null.
Adding a check for "null" resolves it quite easily.
Comment 4 Ondrej Vrabec 2014-04-15 14:24:58 UTC 
releases #6c4f2391c029
Comment 5 Quality Engineering 2014-04-24 02:15:02 UTC 
Integrated into 'releases/release80', will be available in build *201404240045* or newer. Wait for official and publicly available build.

Changeset: http://hg.netbeans.org/releases/rev/6c4f2391c029
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Issue #243417 - NullPointerException at org.netbeans.modules.git.ui.fetch.PullBranchesStep.markMergingBranch
When doing a pull right after git init (the local repository does not have any commit yet) current branch is null.
Adding a check for "null" resolves it quite easily.
(grafted from 72de8be3ffa2da89474b0bfd5278af9895bd8706)