Browse Source

Eliminate warning about overlapping variable names

Change-Id: I7e749092c5b51e2857c186088e2c5c6c6d295367
stable-3.5
Robin Rosenberg 11 years ago committed by Robin Stocker
parent
commit
71c18201c1
  1. 10
      org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java

@ -321,13 +321,13 @@ public class DiffFormatterTest extends RepositoryTestCase {
write(new File(folder, "folder.txt"), "folder change");
ByteArrayOutputStream os = new ByteArrayOutputStream();
DiffFormatter df = new DiffFormatter(new SafeBufferedOutputStream(os));
df.setRepository(db);
df.setPathFilter(PathFilter.create("folder"));
DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os));
dfmt.setRepository(db);
dfmt.setPathFilter(PathFilter.create("folder"));
DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache());
FileTreeIterator newTree = new FileTreeIterator(db);
df.format(oldTree, newTree);
df.flush();
dfmt.format(oldTree, newTree);
dfmt.flush();
String actual = os.toString("UTF-8");
String expected =

Loading…
Cancel
Save