From: Robin Rosenberg <robin.rosenberg@dewire.com>
To: spearce@sparce.org
Cc: git@vger.kernel.org, Robin Rosenberg <robin.rosenberg@dewire.com>
Subject: [EGIT PATCH 03/10] Rename variables that hides others with different content in FetchProcess
Date: Mon, 16 Mar 2009 21:14:36 +0100 [thread overview]
Message-ID: <1237234483-3405-4-git-send-email-robin.rosenberg@dewire.com> (raw)
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<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
next prev parent reply other threads:[~2009-03-16 20:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-16 20:14 [EGIT PATCH 00/10] JGit cleanups Robin Rosenberg
2009-03-16 20:14 ` [EGIT PATCH 01/10] Require javadoc on protected methods in jgit core Robin Rosenberg
2009-03-16 20:14 ` [EGIT PATCH 02/10] Rename the objectsUrl in the nested HttpObjectDB to Robin Rosenberg
2009-03-16 20:14 ` Robin Rosenberg [this message]
2009-03-16 20:14 ` [EGIT PATCH 04/10] Rename a parameter i PackWriter that hides another with the same name Robin Rosenberg
2009-03-16 20:14 ` [EGIT PATCH 05/10] Rename fields to avoid hiding of field names in ReadTreeTest Robin Rosenberg
2009-03-16 20:14 ` [EGIT PATCH 06/10] Rename the gitDir fields to indicate they refer to another dir than the default Robin Rosenberg
2009-03-16 20:14 ` [EGIT PATCH 07/10] Rename a parameter in PushProcessTest that hides another Robin Rosenberg
2009-03-16 20:14 ` [EGIT PATCH 08/10] Drop unused end parameters in hunk parsing code Robin Rosenberg
2009-03-16 20:14 ` [EGIT PATCH 09/10] Drop unused File arguments in IndexTreeWalker and WorkdirCheckout Robin Rosenberg
2009-03-16 20:14 ` [EGIT PATCH 10/10] Drop an effectively unused parameter in IndexTreeWalker Robin Rosenberg
2009-03-16 20:39 ` [EGIT PATCH 08/10] Drop unused end parameters in hunk parsing code Shawn O. Pearce
2009-03-16 20:25 ` [EGIT PATCH 02/10] Rename the objectsUrl in the nested HttpObjectDB to Shawn O. Pearce
2009-03-16 21:25 ` Robin Rosenberg
2009-03-16 21:28 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1237234483-3405-4-git-send-email-robin.rosenberg@dewire.com \
--to=robin.rosenberg@dewire.com \
--cc=git@vger.kernel.org \
--cc=spearce@sparce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).