From: Robin Rosenberg Date: Mon, 16 Mar 2009 20:14:36 GMT Subject: [EGIT PATCH 03/10] Rename variables that hides others with different content in FetchProcess Message-ID: <1237234483-3405-4-git-send-email-robin.rosenberg@dewire.com> In-Reply-To: <1237234483-3405-3-git-send-email-robin.rosenberg@dewire.com> --- .../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 matched) private Collection expandAutoFollowTags() throws TransportException { final Collection additionalTags = new ArrayList(); - final Map have = transport.local.getAllRefs(); + final Map 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 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 matched) } private void expandFetchTags() throws TransportException { - final Map have = transport.local.getAllRefs(); + final Map 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