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.
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)
Created attachment 115924 [details] stacktrace
fix: http://hg.netbeans.org/core-main/rev/49a0ad54e7a8
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
*** Bug 211762 has been marked as a duplicate of this bug. ***
verified in trunk, please transplant to release71_fixes
release71_fixes: http://hg.netbeans.org/releases/rev/23543d43a221
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)
*** Bug 212638 has been marked as a duplicate of this bug. ***
Verified in 7.1 patch 3. The patch will be released soon. To install the patch run Help > Check for Updates in the IDE.