Add null check for issue 911 #2770
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pankraz76
approved these changes
Nov 25, 2025
Contributor
Pankraz76
left a comment
Pankraz76
left a comment
There was a problem hiding this comment.
nice one, that´s how its supposed to be done.
Could you reproduce and might test the issue?
Thanks.
Pankraz76
reviewed
Nov 25, 2025
| // it's not in the tree, so it was added | ||
| return false; | ||
| } else { | ||
| if (hasDirCache) { |
Contributor
There was a problem hiding this comment.
Suggested change
| if (hasDirCache && workingTreeIterator != null) { |
this would also fix the NPE but with potentially different outcome using the default else case. idk whats the difference.
using fallback in L:123 or early exit.
// no dirCache, so we will compare the tree to the workdir manually
Pankraz76
reviewed
Nov 25, 2025
| DirCacheIterator dirCacheIterator = treeWalk.getTree(INDEX, DirCacheIterator.class); | ||
| WorkingTreeIterator workingTreeIterator = treeWalk.getTree(WORKDIR, WorkingTreeIterator.class); | ||
|
|
||
| boolean hasTree = treeIterator != null; |
Contributor
There was a problem hiding this comment.
Suggested change
| boolean hasTree = treeIterator != null; | |
| boolean hasTree = treeIterator != null && workingTreeIterator != null; |
would also do the trick, calling the else case.
Ned should make the the call on this. Im just pointing out ideas. Thanks.
This was referenced Nov 25, 2025
Pankraz76
reviewed
Nov 26, 2025
| ### Changes | ||
| * Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763)) | ||
| * Bump default `gherkin-utils` version to latest `9.2.0` -> `10.0.0`. ([#2619](https://github.com/diffplug/spotless/pull/2619)) | ||
| - Fix null pointer exception when git ignored files are checked in ([911](https://github.com/diffplug/spotless/issues/911)) |
Contributor
There was a problem hiding this comment.
considering fixed block.
### Fixed
Thanks for your good template. it was simple to continue thanks to your contribution.
Member
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed fix for issue 911.