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 236814 - Local Branch is not available for merge - NPE in log
Summary: Local Branch is not available for merge - NPE in log
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.4
Hardware: PC Windows 7
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
: 246545 (view as bug list)
Depends on:
Blocks:
 
Reported: 2013-10-06 21:43 UTC by markiewb
Modified: 2014-08-19 10:49 UTC (History)
2 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:

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 markiewb 2013-10-06 21:43:12 UTC 
I wanted to merge a local branch "feature/issue13-assertEquals" into master.
But "Git|Branch|Merge Revision" didn't show up my local branch. There was an exception in the logfile.

SEVERE [org.openide.util.RequestProcessor]: Error in RequestProcessor org.netbeans.modules.git.ui.repository.RepositoryBrowserPanel$BranchesTopChildren$1
java.lang.NullPointerException
	at org.netbeans.modules.git.ui.repository.RepositoryBrowserPanel$BranchesTopChildren.refreshBranches(RepositoryBrowserPanel.java:749)
	at org.netbeans.modules.git.ui.repository.RepositoryBrowserPanel$BranchesTopChildren.access$1500(RepositoryBrowserPanel.java:660)
	at org.netbeans.modules.git.ui.repository.RepositoryBrowserPanel$BranchesTopChildren$1.perform(RepositoryBrowserPanel.java:719)
	at org.netbeans.modules.git.client.GitProgressSupport.performIntern(GitProgressSupport.java:102)
	at org.netbeans.modules.git.client.GitProgressSupport.run(GitProgressSupport.java:95)
	at org.openide.util.RequestProcessor$Task.run(RequestProcessor.java:1432)
[catch] at org.openide.util.RequestProcessor$Processor.run(RequestProcessor.java:2042)

My branches are the following:
  feature/issue13-assertEquals
* master
  remotes/origin/feature_extractparts
  remotes/origin/master


Product Version: NetBeans IDE 7.4 RC2 (Build 201309252201)
Java: 1.7.0_40; Java HotSpot(TM) 64-Bit Server VM 24.0-b56
Runtime: Java(TM) SE Runtime Environment 1.7.0_40-b43
System: Windows 7 version 6.1 running on amd64; Cp1252; en_US (nb)
User directory: C:\Users\markiewb\AppData\Roaming\NetBeans\7.4rc2
Cache directory: C:\Users\markiewb\AppData\Local\NetBeans\Cache\7.4rc2

Workaround: merge via git cli client
Comment 1 Ondrej Vrabec 2013-10-07 07:36:05 UTC 
It's something about JGit not being able to find the common ancestor of feature/issue13-assertEquals and master branches. Might be the same as #232904 (or at least the upstream issue in JGit). I'll at least deal with the NPE so other branches are listed in the dialog.

fix: http://hg.netbeans.org/core-main/rev/abb5c04bd622
Comment 2 Quality Engineering 2013-10-08 02:33:42 UTC 
Integrated into 'main-silver', will be available in build *201310080001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/abb5c04bd622
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #236814 - Local Branch is not available for merge - NPE in log
Comment 3 Ondrej Vrabec 2014-08-19 10:49:13 UTC 
*** Bug 246545 has been marked as a duplicate of this bug. ***