Merge changes I3a74cc84,I219f864f

* changes:
  [findbugs] Do not ignore exceptional return value of createNewFile()
  Do not create files to be updated before checkout of DirCache entry

1 files changed, 4 insertions, 6 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/IndexDiffFilterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/IndexDiffFilterTest.java
index 542e169d73..4c103c83da 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/IndexDiffFilterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/IndexDiffFilterTest.java
@@ -56,6 +56,7 @@ import org.eclipse.jgit.lib.RepositoryTestCase;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.treewalk.FileTreeIterator;
 import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.util.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -537,8 +538,7 @@ public class IndexDiffFilterTest extends RepositoryTestCase {
 
 	private void createEmptyFolder() throws Exception {
 		File path = new File(db.getWorkTree(), FOLDER);
-		path.mkdir();
-		assertTrue(path.isDirectory());
+		FileUtils.mkdir(path);
 	}
 
 	private RevCommit createEmptyFolderAndCommit() throws Exception {
@@ -548,14 +548,12 @@ public class IndexDiffFilterTest extends RepositoryTestCase {
 
 	private void createEmptyFolderUntracked() throws Exception {
 		File path = new File(db.getWorkTree(), UNTRACKED_FOLDER);
-		path.mkdir();
-		assertTrue(path.isDirectory());
+		FileUtils.mkdir(path);
 	}
 
 	private void createEmptyFolderIgnored() throws Exception {
 		File path = new File(db.getWorkTree(), IGNORED_FOLDER);
-		path.mkdir();
-		assertTrue(path.isDirectory());
+		FileUtils.mkdir(path);
 		writeTrashFile(GITIGNORE, GITIGNORE + "\n" + IGNORED_FOLDER + "/");
 	}