Merge "Fix null ref exception in DirCacheCheckout"

14 years ago · e8315ce19d
1 changed files with 3 additions and 2 deletions
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
@ -274,8 +274,9 @@ public class DirCacheCheckout {
 			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