github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Eliminate warning about overlapping variable names 

Change-Id: I7e749092c5b51e2857c186088e2c5c6c6d295367
stable-3.5
Robin Rosenberg 10 years ago committed by Robin Stocker
parent
a03bdcbbb4
commit
71c18201c1
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

Write Preview
Loading…
Cancel
Save