Browse Source

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
tags/v0.11.1
Robin Rosenberg 13 years ago
parent
commit
9ffcf2a8b3

+ 2
- 3
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/FileResolverTest.java View File

@@ -47,7 +47,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.io.File;
@@ -58,6 +57,7 @@ import org.eclipse.jgit.http.server.resolver.FileResolver;
import org.eclipse.jgit.http.server.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.util.FileUtils;
import org.junit.Test;

public class FileResolverTest extends LocalDiskRepositoryTestCase {
@@ -116,8 +116,7 @@ public class FileResolverTest extends LocalDiskRepositoryTestCase {
fail("did not honor export-all flag");
}

export.createNewFile();
assertTrue("has git-daemon-export-ok", export.exists());
FileUtils.createNewFile(export);
resolver = new FileResolver(base, false /* require flag */);
try {
resolver.open(null, name).close();

+ 4
- 6
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/IndexDiffFilterTest.java View File

@@ -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 + "/");
}


+ 0
- 1
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java View File

@@ -422,7 +422,6 @@ public class DirCacheCheckout {
if (!file.getParentFile().mkdirs()) {
// ignore
}
file.createNewFile();
DirCacheEntry entry = dc.getEntry(path);
checkoutEntry(repo, file, entry);
}

Loading…
Cancel
Save