diff options
| author | Shawn Pearce <sop@google.com> | 2014-11-25 13:49:22 -0800 |
|---|---|---|
| committer | Shawn Pearce <spearce@spearce.org> | 2014-11-27 13:37:12 -0800 |
| commit | 75b4a23748772be2e689db12e2d1e7d1aa43e06f (patch) | |
| tree | 2473cbf1e70c602815f7c3e44f1db1830afbf841 /org.eclipse.jgit.test | |
| parent | 6814728a821144617e5fe81d54bad8df12ce2586 (diff) | |
| download | jgit-75b4a23748772be2e689db12e2d1e7d1aa43e06f.tar.gz jgit-75b4a23748772be2e689db12e2d1e7d1aa43e06f.zip | |
Deprecate checkoutEntry variant that accepts File
Entries should only be written to the working tree managed by the
Repository. Simplify callers by passing only the entry and computing
the work tree location inside of the checkoutEntry method.
Change-Id: I574e41280d0407f1853fda12f4bd0d30f75d74e7
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java index b3dc267b97..7964578c36 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java @@ -281,7 +281,7 @@ public class FileTreeIteratorTest extends RepositoryTestCase { @Test public void testIsModifiedSymlinkAsFile() throws Exception { - File f = writeTrashFile("symlink", "content"); + writeTrashFile("symlink", "content"); Git git = new Git(db); db.getConfig().setString(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_SYMLINKS, "false"); @@ -292,7 +292,7 @@ public class FileTreeIteratorTest extends RepositoryTestCase { DirCacheEntry dce = db.readDirCache().getEntry("symlink"); dce.setFileMode(FileMode.SYMLINK); ObjectReader objectReader = db.newObjectReader(); - DirCacheCheckout.checkoutEntry(db, f, dce, objectReader); + DirCacheCheckout.checkoutEntry(db, dce, objectReader); FileTreeIterator fti = new FileTreeIterator(trash, db.getFS(), db .getConfig().get(WorkingTreeOptions.KEY)); |