From e8c69fa5fd9db037a02e05ea9e660f34e8cbd757 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sun, 25 Feb 2018 17:32:21 +0900 Subject: [PATCH] WorkingTreeIterator: Fix warnings about variable hiding Change-Id: I78ed3ae7aa30a7e7f146d0bd2e9feff74554da78 Signed-off-by: David Pursehouse --- .../org/eclipse/jgit/treewalk/WorkingTreeIterator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index 83c93ba8b..37b7d0956 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -1485,10 +1485,10 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { 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;