motiejus
/
jgit
1
Fork 0
Code Releases Activity

WorkingTreeIterator: Fix warnings about variable hiding 

Change-Id: I78ed3ae7aa30a7e7f146d0bd2e9feff74554da78
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-02-25 17:32:21 +09:00
parent 6ea21b454c
commit e8c69fa5fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
View File

@ -1485,10 +1485,10 @@ private boolean isDirectoryIgnored(String pathRel, String pathAbs)
return true;
}
final IgnoreNode ignoreNode = getIgnoreNode();
for (String path = pathRel; ignoreNode != null
&& !"".equals(path); path = getParentPath(path)) { //$NON-NLS-1$
ignored = ignoreNode.checkIgnored(path, true);
final IgnoreNode node = getIgnoreNode();
for (String p = pathRel; node != null
&& !"".equals(p); p = getParentPath(p)) { //$NON-NLS-1$
ignored = node.checkIgnored(p, true);
if (ignored != null) {
state.directoryToIgnored.put(pathAbs, ignored);
return ignored;