motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Fix null ref exception in DirCacheCheckout"

This commit is contained in:
Shawn Pearce 2010-11-12 11:29:32 -05:00 committed by Code Review
parent 8c706ab464 3b4dcb3c02
commit e8315ce19d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,8 +274,9 @@ void processEntry(CanonicalTreeParser m, DirCacheBuildIterator i,
WorkingTreeIterator f) {
if (m != null) {
if (i == null || f == null || !m.idEqual(i)
|| f.isModified(i.getDirCacheEntry(), true,
config_filemode(), repo.getFS())) {
|| (i.getDirCacheEntry() != null && f.isModified(i
.getDirCacheEntry(), true, config_filemode(), repo
.getFS()))) {
update(m.getEntryPathString(), m.getEntryObjectId(),
m.getEntryFileMode());
} else