motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "[findBugs] Fix NP_LOAD_OF_KNOWN_NULL_VALUE"

This commit is contained in:
Chris Aniszczyk 2010-11-07 16:09:00 -05:00 committed by Code Review
parent 83019318c6 220cd43482
commit d6fec1988c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
View File

@ -406,7 +406,7 @@ void processEntry(AbstractTreeIterator h, AbstractTreeIterator m,
// File/Directory conflict case #20
if (walk.isDirectoryFileConflict())
// TODO: check whether it is always correct to report a conflict here
conflict(name, null, h, m);
conflict(name, null, null, null);
// file only exists in working tree -> ignore it
return;