Browse Source

WorkingTreeIterator: Fix warnings about variable hiding

Change-Id: I78ed3ae7aa30a7e7f146d0bd2e9feff74554da78
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.11
David Pursehouse 7 years ago
parent
commit
e8c69fa5fd
  1. 8
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

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

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

Loading…
Cancel
Save