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 208617 - NullPointerException at org.netbeans.libs.git.jgit.commands.AddCommand.run
Summary: NullPointerException at org.netbeans.libs.git.jgit.commands.AddCommand.run
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.1.2
Hardware: All All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
: 211762 212638 (view as bug list)
Depends on: 207073
Blocks:
  Show dependency tree
 
Reported: 2012-02-19 20:31 UTC by budgie67
Modified: 2012-05-21 06:56 UTC (History)
6 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter: 184440


Attachments
stacktrace (5.44 KB, text/plain)
2012-02-19 20:31 UTC, budgie67
Details

Note You need to log in before you can comment on or make changes to this bug.
Description budgie67 2012-02-19 20:31:25 UTC
Build: NetBeans IDE Dev (Build 201202091324)
VM: Java HotSpot(TM) Client VM, 20.5-b03, Java(TM) SE Runtime Environment, 1.6.0_30-b12
OS: Windows 7

User Comments:
karel_barel: This exception appeared after resolving git conflicts in html.twg file and saving the changes

karel_barel: interactively resolved conflicts using file tab context menu Git / Resolve conflicts, which run the conflict resolver, after fixing the conflicts, ide wanted me to save changes




Stacktrace: 
java.lang.NullPointerException
   at org.netbeans.libs.git.jgit.commands.AddCommand.run(AddCommand.java:117)
   at org.netbeans.libs.git.jgit.commands.GitCommand.execute(GitCommand.java:72)
   at org.netbeans.libs.git.GitClient.add(GitClient.java:220)
   at org.netbeans.modules.git.client.GitClient$1.call(GitClient.java:209)
   at org.netbeans.modules.git.client.GitClient$1.call(GitClient.java:205)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker$1.call(GitClient.java:742)
Comment 1 budgie67 2012-02-19 20:31:28 UTC
Created attachment 115924 [details]
stacktrace
Comment 2 Ondrej Vrabec 2012-02-20 11:07:34 UTC
fix: http://hg.netbeans.org/core-main/rev/49a0ad54e7a8
Comment 3 Quality Engineering 2012-02-22 11:02:10 UTC
Integrated into 'main-golden', will be available in build *201202220400* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/49a0ad54e7a8
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #208617 - NullPointerException at org.netbeans.libs.git.jgit.commands.AddCommand.run
Comment 4 Ondrej Vrabec 2012-04-26 08:25:44 UTC
*** Bug 211762 has been marked as a duplicate of this bug. ***
Comment 5 Stepan Zebra 2012-05-14 15:08:04 UTC
verified in trunk, please transplant to release71_fixes
Comment 6 Ondrej Vrabec 2012-05-14 15:27:53 UTC
release71_fixes: http://hg.netbeans.org/releases/rev/23543d43a221
Comment 7 Quality Engineering 2012-05-15 15:03:59 UTC
Integrated into 'releases', will be available in build *201205151102* or newer. Wait for official and publicly available build.
Changeset: http://hg.netbeans.org/releases/rev/23543d43a221
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #208617 - NullPointerException at org.netbeans.libs.git.jgit.commands.AddCommand.run
(transplanted from 49a0ad54e7a85847b91d87b16d60ce447c0ffc3c)
Comment 8 Ondrej Vrabec 2012-05-17 17:11:46 UTC
*** Bug 212638 has been marked as a duplicate of this bug. ***
Comment 9 Stepan Zebra 2012-05-21 06:56:55 UTC
Verified in 7.1 patch 3.
The patch will be released soon.
To install the patch run Help > Check for Updates in the IDE.