| Summary: | java.lang.NullPointerException at org.eclipse.egit.ui.internal.CompareUtils.compareHeadWithWorkspace(CompareUtils.java:349) | ||
|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | Michael Vorburger <mike> |
| Component: | UI | Assignee: | Project Inbox <egit.ui-inbox> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | matthias.sohn, remy.suen |
| Version: | 1.1 | ||
| Target Milestone: | --- | ||
| Hardware: | All | ||
| OS: | All | ||
| Whiteboard: | |||
|
Description
Michael Vorburger
(In reply to comment #0) > Using 1.1.0.201109151100-r, I had a pom.xml with a wrong > <parent><relativePath>../pom.xml</relativePath> which I corrected, and upon > double-clicking to do a compare of the pom.xml in the Files list in the Commit > Changes dialog, the NPE below occurred. Where did you perform this double-click action? It seems you performed it from the commit dialog, is this correct? Where is the pom.xml relative to the .git folder? > Where did you perform this double-click action? It seems you > performed it from the commit dialog, is this correct? Yes indeed. > Where is the pom.xml relative to the .git folder? This pom.xml I had changed and edited here was in a sub-folder, imagine a layout like: .git/ module1/pom.xml Thanks for looking into this! (In reply to comment #2) > module1/pom.xml Was your module1 project closed in Eclipse? > Was your module1 project closed in Eclipse?
I don't recall... could be (I do close Eclipse projects / Maven modules), but not 100% sure.
Thanks for your bug report, Michael. I have pushed a change set to Gerrit for review by the other EGit developers. http://egit.eclipse.org/r/#change,4390 1. Make a file in a project that's controlled by Git dirty. 2. Close that project. 3. Start a commit operation from another project that's in the same Git repository as the project in 1 and 2. 4. Try to double-click on the dirty file from 1, the NPE described by comment 0 will be thrown. merged as 37cf040e06836a3ee9e13918789e7fb56bc6ffdb |