[EGIT PATCH 03/10] Rename variables that hides others with different content in FetchProcess
From: Robin Rosenberg <hidden>
Date: 2016-06-15 22:46:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- .../org/spearce/jgit/transport/FetchProcess.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java
index df64817..f216cba 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java@@ -298,7 +298,7 @@ private void expandSingle(final RefSpec spec, final Set<Ref> matched) private Collection<Ref> expandAutoFollowTags() throws TransportException { final Collection<Ref> additionalTags = new ArrayList<Ref>(); - final Map<String, Ref> have = transport.local.getAllRefs(); + final Map<String, Ref> haveRefs = transport.local.getAllRefs(); for (final Ref r : conn.getRefs()) { if (!isTag(r)) continue;
@@ -307,7 +307,7 @@ private void expandSingle(final RefSpec spec, final Set<Ref> matched) continue; } - final Ref local = have.get(r.getName()); + final Ref local = haveRefs.get(r.getName()); if (local != null) { if (!r.getObjectId().equals(local.getObjectId())) wantTag(r);
@@ -321,11 +321,11 @@ private void expandSingle(final RefSpec spec, final Set<Ref> matched) } private void expandFetchTags() throws TransportException { - final Map<String, Ref> have = transport.local.getAllRefs(); + final Map<String, Ref> haveRefs = transport.local.getAllRefs(); for (final Ref r : conn.getRefs()) { if (!isTag(r)) continue; - final Ref local = have.get(r.getName()); + final Ref local = haveRefs.get(r.getName()); if (local == null || !r.getObjectId().equals(local.getObjectId())) wantTag(r); }
--
1.6.1.285.g35d8b