From 71261adcd7b83d3151618bd36d0a9f2694114d97 Mon Sep 17 00:00:00 2001 From: Charles O'Farrell Date: Fri, 22 Aug 2008 06:55:22 +1000 Subject: [PATCH] Added forward slash to head/remote/tag prefix Constants eg. Constants.HEADS_PREFIX + "/" ==> Constants.R_HEADS This was always done by every instance anyway and so this will ensure it isn't forgotten again. Signed-off-by: Charles O'Farrell Signed-off-by: Shawn O. Pearce --- .../org/spearce/egit/core/op/CloneOperation.java | 9 ++------- .../ui/internal/clone/CloneDestinationPage.java | 8 ++++---- .../egit/ui/internal/clone/SourceBranchPage.java | 8 ++++---- .../ui/internal/components/RefContentProposal.java | 5 ++--- .../egit/ui/internal/components/RefSpecPanel.java | 16 ++++++--------- .../egit/ui/internal/push/PushResultTable.java | 3 +-- .../src/org/spearce/jgit/pgm/Branch.java | 10 +++++----- .../src/org/spearce/jgit/pgm/Fetch.java | 5 +++-- .../src/org/spearce/jgit/pgm/Push.java | 3 ++- .../src/org/spearce/jgit/pgm/Tag.java | 8 ++++---- .../src/org/spearce/jgit/pgm/TextBuiltin.java | 23 ++++++++++------------ .../src/org/spearce/jgit/lib/Constants.java | 6 +++--- .../src/org/spearce/jgit/lib/RefDatabase.java | 12 +++++------ .../src/org/spearce/jgit/lib/Repository.java | 2 +- org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java | 2 +- .../spearce/jgit/transport/FetchHeadRecord.java | 23 ++++++++++------------ .../org/spearce/jgit/transport/FetchProcess.java | 2 +- .../spearce/jgit/transport/WalkPushConnection.java | 4 ++-- 18 files changed, 66 insertions(+), 83 deletions(-) diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/CloneOperation.java b/org.spearce.egit.core/src/org/spearce/egit/core/op/CloneOperation.java index 531045b1..145c50b8 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/op/CloneOperation.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/op/CloneOperation.java @@ -44,11 +44,6 @@ import org.spearce.jgit.transport.URIish; * Clones a repository from a remote location to a local location. */ public class CloneOperation implements IRunnableWithProgress { - private static final String HEADS_PREFIX = Constants.HEADS_PREFIX; - - private static final String REMOTES_PREFIX_S = Constants.REMOTES_PREFIX - + "/"; - private final URIish uri; private final boolean allSelected; @@ -146,10 +141,10 @@ public class CloneOperation implements IRunnableWithProgress { remoteConfig = new RemoteConfig(local.getConfig(), remoteName); remoteConfig.addURI(uri); - final String dst = REMOTES_PREFIX_S + remoteConfig.getName(); + final String dst = Constants.R_REMOTES + remoteConfig.getName(); RefSpec wcrs = new RefSpec(); wcrs = wcrs.setForceUpdate(true); - wcrs = wcrs.setSourceDestination(HEADS_PREFIX + "/*", dst + "/*"); + wcrs = wcrs.setSourceDestination(Constants.R_HEADS + "*", dst + "/*"); if (allSelected) { remoteConfig.addFetchRefSpec(wcrs); diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java index a5606368..51733352 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java @@ -199,8 +199,8 @@ class CloneDestinationPage extends WizardPage { public String getInitialBranch() { final int ix = initialBranch.getSelectionIndex(); if (ix < 0) - return Constants.HEADS_PREFIX + "/" + Constants.MASTER; - return Constants.HEADS_PREFIX + "/" + initialBranch.getItem(ix); + return Constants.R_HEADS + Constants.MASTER; + return Constants.R_HEADS + initialBranch.getItem(ix); } /** @@ -296,8 +296,8 @@ class CloneDestinationPage extends WizardPage { int newix = 0; for (final Ref r : branchPage.getSelectedBranches()) { String name = r.getName(); - if (name.startsWith(Constants.HEADS_PREFIX + "/")) - name = name.substring((Constants.HEADS_PREFIX + "/").length()); + if (name.startsWith(Constants.R_HEADS)) + name = name.substring((Constants.R_HEADS).length()); if (head != null && head.getName().equals(r.getName())) newix = initialBranch.getItemCount(); initialBranch.add(name); diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java index 169cc871..f131d937 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java @@ -254,7 +254,7 @@ class SourceBranchPage extends BaseWizardPage { head = null; for (final Ref r : listRemoteOp.getRemoteRefs()) { final String n = r.getName(); - if (!n.startsWith(Constants.HEADS_PREFIX + "/")) + if (!n.startsWith(Constants.R_HEADS)) continue; availableRefs.add(r); if (idHEAD == null || head != null) @@ -275,8 +275,8 @@ class SourceBranchPage extends BaseWizardPage { validatedRepoSelection = newRepoSelection; for (final Ref r : availableRefs) { String n = r.getName(); - if (n.startsWith(Constants.HEADS_PREFIX + "/")) - n = n.substring((Constants.HEADS_PREFIX + "/").length()); + if (n.startsWith(Constants.R_HEADS)) + n = n.substring(Constants.R_HEADS.length()); final TableItem ti = new TableItem(refsTable, SWT.NONE); ti.setText(n); ti.setChecked(true); @@ -290,4 +290,4 @@ class SourceBranchPage extends BaseWizardPage { transportError = msg; checkPage(); } -} \ No newline at end of file +} diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefContentProposal.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefContentProposal.java index 9c35710d..60abaf37 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefContentProposal.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefContentProposal.java @@ -31,9 +31,8 @@ import org.spearce.jgit.lib.Tree; * prefixes) and information about pointed object if it exists locally. */ public class RefContentProposal implements IContentProposal { - private static final String PREFIXES[] = new String[] { - Constants.HEADS_PREFIX + "/", Constants.REMOTES_PREFIX + "/", - Constants.TAGS_PREFIX + "/" }; + private static final String PREFIXES[] = new String[] { Constants.R_HEADS, + Constants.R_REMOTES, Constants.R_TAGS }; private static final String PREFIXES_DESCRIPTIONS[] = new String[] { " [branch]", " [tracking branch]", " [tag]" }; diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPanel.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPanel.java index 0dc27a57..34d37fda 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPanel.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPanel.java @@ -118,10 +118,6 @@ import org.spearce.jgit.transport.Transport; * @see SelectionChangeListener */ public class RefSpecPanel { - private static final String REMOTES_PREFIX_S = Constants.REMOTES_PREFIX + '/'; - - private static final String HEADS_PREFIX_S = Constants.HEADS_PREFIX + '/'; - private static final String IMAGE_ADD = "ADD"; //$NON-NLS-1$ private static final String IMAGE_DELETE = "DELETE"; //$NON-NLS-1$ @@ -203,7 +199,7 @@ public class RefSpecPanel { for (final RefContentProposal p : proposals) { final String content = p.getContent(); if (content.equals(Constants.HEAD) - || content.startsWith(HEADS_PREFIX_S)) + || content.startsWith(Constants.R_HEADS)) result.add(p); } return result; @@ -1391,9 +1387,9 @@ public class RefSpecPanel { return; } } - if (remoteName != null && src.startsWith(HEADS_PREFIX_S)) { - final String newDst = REMOTES_PREFIX_S + remoteName + '/' - + src.substring(HEADS_PREFIX_S.length()); + if (remoteName != null && src.startsWith(Constants.R_HEADS)) { + final String newDst = Constants.R_REMOTES + remoteName + '/' + + src.substring(Constants.R_HEADS.length()); creationDstCombo.setText(newDst); } } @@ -1733,10 +1729,10 @@ public class RefSpecPanel { final String content = p.getContent(); if (pushSpecs) { if (content.equals(Constants.HEAD) - || content.startsWith(HEADS_PREFIX_S)) + || content.startsWith(Constants.R_HEADS)) result.add(p); } else { - if (content.startsWith(REMOTES_PREFIX_S)) + if (content.startsWith(Constants.R_REMOTES)) result.add(p); } } diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultTable.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultTable.java index 5daf1536..2cf2be49 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultTable.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultTable.java @@ -223,8 +223,7 @@ class PushResultTable { final Ref oldRef = rue.getAdvertisedRemoteRef(uri); if (oldRef == null) { - if (rue.getDstRefName().startsWith( - Constants.TAGS_PREFIX + "/")) + if (rue.getDstRefName().startsWith(Constants.R_TAGS)) return UIText.PushResultTable_statusOkNewTag; return UIText.PushResultTable_statusOkNewBranch; } diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java index 025ada46..a266244e 100644 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java @@ -101,8 +101,8 @@ class Branch extends TextBuiltin { String current = head.getName(); if (current.equals(Constants.HEAD)) addRef("(no branch)", head); - addRefs(refs, Constants.HEADS_PREFIX + '/', !remote); - addRefs(refs, Constants.REMOTES_PREFIX + '/', remote); + addRefs(refs, Constants.R_HEADS, !remote); + addRefs(refs, Constants.R_REMOTES, remote); for (final Entry e : printRefs.entrySet()) { final Ref ref = e.getValue(); printHead(e.getKey(), current.equals(ref.getName()), ref); @@ -150,9 +150,9 @@ class Branch extends TextBuiltin { String err = "Cannot delete the branch '%s' which you are currently on."; throw die(String.format(err, branch)); } - RefUpdate update = db.updateRef((remote ? Constants.REMOTES_PREFIX - : Constants.HEADS_PREFIX) - + '/' + branch); + RefUpdate update = db.updateRef((remote ? Constants.R_REMOTES + : Constants.R_HEADS) + + branch); update.setNewObjectId(head); update.setForceUpdate(force || remote); Result result = update.delete(); diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java index 99ed1010..e14e213e 100644 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java @@ -41,6 +41,7 @@ import java.util.List; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; +import org.spearce.jgit.lib.Constants; import org.spearce.jgit.lib.RefUpdate; import org.spearce.jgit.lib.TextProgressMonitor; import org.spearce.jgit.transport.FetchResult; @@ -102,9 +103,9 @@ class Fetch extends TextBuiltin { return "[i/o error]"; if (r == RefUpdate.Result.NEW) { - if (u.getRemoteName().startsWith(REFS_HEADS)) + if (u.getRemoteName().startsWith(Constants.R_HEADS)) return "[new branch]"; - else if (u.getLocalName().startsWith(REFS_TAGS)) + else if (u.getLocalName().startsWith(Constants.R_TAGS)) return "[new tag]"; return "[new]"; } diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java index 3e493e6f..f53f2fe2 100644 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java @@ -43,6 +43,7 @@ import java.util.List; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; +import org.spearce.jgit.lib.Constants; import org.spearce.jgit.lib.Ref; import org.spearce.jgit.lib.TextProgressMonitor; import org.spearce.jgit.transport.PushResult; @@ -165,7 +166,7 @@ class Push extends TextBuiltin { final Ref oldRef = result.getAdvertisedRef(remoteName); if (oldRef == null) { final String summary; - if (remoteName.startsWith(REFS_TAGS)) + if (remoteName.startsWith(Constants.R_TAGS)) summary = "[new tag]"; else summary = "[new branch]"; diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java index 6c735523..d119ebb2 100644 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java @@ -67,11 +67,11 @@ class Tag extends TextBuiltin { throw die("Cannot resolve " + Constants.HEAD); } - if (!tagName.startsWith(Constants.TAGS_PREFIX + "/")) - tagName = Constants.TAGS_PREFIX + "/" + tagName; + if (!tagName.startsWith(Constants.R_TAGS)) + tagName = Constants.R_TAGS + tagName; if (!force && db.resolve(tagName) != null) { throw die("fatal: tag '" - + tagName.substring(Constants.TAGS_PREFIX.length() + 1) + + tagName.substring(Constants.R_TAGS.length()) + "' exists"); } @@ -84,7 +84,7 @@ class Tag extends TextBuiltin { tag.setType(Constants.typeString(ldr.getType())); tag.setTagger(new PersonIdent(db)); tag.setMessage(message.replaceAll("\r", "")); - tag.setTag(tagName.substring(Constants.TAGS_PREFIX.length() + 1)); + tag.setTag(tagName.substring(Constants.R_TAGS.length())); tag.tag(); } } diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java index 23ab92b1..2206c617 100644 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java @@ -38,6 +38,10 @@ package org.spearce.jgit.pgm; +import static org.spearce.jgit.lib.Constants.R_HEADS; +import static org.spearce.jgit.lib.Constants.R_REMOTES; +import static org.spearce.jgit.lib.Constants.R_TAGS; + import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStreamWriter; @@ -45,7 +49,6 @@ import java.io.PrintWriter; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.Option; -import org.spearce.jgit.lib.Constants; import org.spearce.jgit.lib.ObjectId; import org.spearce.jgit.lib.Repository; import org.spearce.jgit.pgm.opt.CmdLineParser; @@ -63,12 +66,6 @@ import org.spearce.jgit.revwalk.RevWalk; * even though it was constructed. */ public abstract class TextBuiltin { - protected static final String REFS_HEADS = Constants.HEADS_PREFIX + "/"; - - protected static final String REFS_REMOTES = Constants.REMOTES_PREFIX + "/"; - - protected static final String REFS_TAGS = Constants.TAGS_PREFIX + "/"; - private String commandName; @Option(name = "--help", usage = "display this help text", aliases = { "-h" }) @@ -180,12 +177,12 @@ public abstract class TextBuiltin { } protected String abbreviateRef(String dst, boolean abbreviateRemote) { - if (dst.startsWith(REFS_HEADS)) - dst = dst.substring(REFS_HEADS.length()); - else if (dst.startsWith(REFS_TAGS)) - dst = dst.substring(REFS_TAGS.length()); - else if (abbreviateRemote && dst.startsWith(REFS_REMOTES)) - dst = dst.substring(REFS_REMOTES.length()); + if (dst.startsWith(R_HEADS)) + dst = dst.substring(R_HEADS.length()); + else if (dst.startsWith(R_TAGS)) + dst = dst.substring(R_TAGS.length()); + else if (abbreviateRemote && dst.startsWith(R_REMOTES)) + dst = dst.substring(R_REMOTES.length()); return dst; } } diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java index 331c7dc5..f3168819 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java @@ -208,13 +208,13 @@ public final class Constants { public static final String MASTER = "master"; /** Prefix for branch refs */ - public static final String HEADS_PREFIX = "refs/heads"; + public static final String R_HEADS = "refs/heads/"; /** Prefix for remotes refs */ - public static final String REMOTES_PREFIX = "refs/remotes"; + public static final String R_REMOTES = "refs/remotes/"; /** Prefix for tag refs */ - public static final String TAGS_PREFIX = "refs/tags"; + public static final String R_TAGS = "refs/tags/"; /** Logs folder name */ public static final String LOGS = "logs"; diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java index be5a2fe8..5c1f0606 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java @@ -38,6 +38,8 @@ package org.spearce.jgit.lib; +import static org.spearce.jgit.lib.Constants.R_TAGS; + import java.io.BufferedReader; import java.io.EOFException; import java.io.File; @@ -55,12 +57,8 @@ import org.spearce.jgit.util.NB; class RefDatabase { private static final String REFS_SLASH = "refs/"; - private static final String HEADS_SLASH = Constants.HEADS_PREFIX + "/"; - - private static final String TAGS_SLASH = Constants.TAGS_PREFIX + "/"; - private static final String[] refSearchPaths = { "", REFS_SLASH, - TAGS_SLASH, HEADS_SLASH, Constants.REMOTES_PREFIX + "/" }; + R_TAGS, Constants.R_HEADS, Constants.R_REMOTES }; private final Repository db; @@ -188,8 +186,8 @@ class RefDatabase { Map getTags() { final Map tags = new HashMap(); for (final Ref r : readRefs().values()) { - if (r.getName().startsWith(TAGS_SLASH)) - tags.put(r.getName().substring(TAGS_SLASH.length()), r); + if (r.getName().startsWith(R_TAGS)) + tags.put(r.getName().substring(R_TAGS.length()), r); } return tags; } diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java index f1762712..73034384 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java @@ -170,7 +170,7 @@ public class Repository { new File(gitDir, "branches").mkdir(); new File(gitDir, "remotes").mkdir(); - final String master = Constants.HEADS_PREFIX + "/" + Constants.MASTER; + final String master = Constants.R_HEADS + Constants.MASTER; refs.link(Constants.HEAD, master); getConfig().create(); diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java index b3039f25..aa4baf41 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java @@ -202,7 +202,7 @@ public class Tag { id = objId; } - ru = objdb.updateRef(Constants.TAGS_PREFIX + "/" + getTag()); + ru = objdb.updateRef(Constants.R_TAGS + getTag()); ru.setNewObjectId(id); ru.setRefLogMessage("tagged " + getTag(), false); if (ru.forceUpdate() == RefUpdate.Result.LOCK_FAILURE) diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchHeadRecord.java b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchHeadRecord.java index ead38925..83a16dca 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchHeadRecord.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchHeadRecord.java @@ -37,18 +37,15 @@ package org.spearce.jgit.transport; +import static org.spearce.jgit.lib.Constants.R_HEADS; +import static org.spearce.jgit.lib.Constants.R_REMOTES; +import static org.spearce.jgit.lib.Constants.R_TAGS; + import java.io.PrintWriter; -import org.spearce.jgit.lib.Constants; import org.spearce.jgit.lib.ObjectId; class FetchHeadRecord { - private static final String REFS_HEADS = Constants.HEADS_PREFIX + "/"; - - private static final String REFS_REMOTES = Constants.REMOTES_PREFIX + "/"; - - private static final String REFS_TAGS = Constants.TAGS_PREFIX + "/"; - ObjectId newValue; boolean notForMerge; @@ -60,15 +57,15 @@ class FetchHeadRecord { void write(final PrintWriter pw) { final String type; final String name; - if (sourceName.startsWith(REFS_HEADS)) { + if (sourceName.startsWith(R_HEADS)) { type = "branch"; - name = sourceName.substring(REFS_HEADS.length()); - } else if (sourceName.startsWith(REFS_TAGS)) { + name = sourceName.substring(R_HEADS.length()); + } else if (sourceName.startsWith(R_TAGS)) { type = "tag"; - name = sourceName.substring(REFS_TAGS.length()); - } else if (sourceName.startsWith(REFS_REMOTES)) { + name = sourceName.substring(R_TAGS.length()); + } else if (sourceName.startsWith(R_REMOTES)) { type = "remote branch"; - name = sourceName.substring(REFS_REMOTES.length()); + name = sourceName.substring(R_REMOTES.length()); } else { type = ""; name = sourceName; 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 e99869c7..654572db 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java @@ -361,6 +361,6 @@ class FetchProcess { } private static boolean isTag(final String name) { - return name.startsWith(Constants.TAGS_PREFIX + "/"); + return name.startsWith(Constants.R_TAGS); } } diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkPushConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkPushConnection.java index 7497bca2..31c86df4 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkPushConnection.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkPushConnection.java @@ -358,7 +358,7 @@ class WalkPushConnection extends BaseConnection implements PushConnection { // for (final RemoteRefUpdate u : updates) { final String n = u.getRemoteName(); - if (n.equals(Constants.HEADS_PREFIX + "/" + Constants.MASTER)) + if (n.equals(Constants.R_HEADS + Constants.MASTER)) return n; } @@ -367,7 +367,7 @@ class WalkPushConnection extends BaseConnection implements PushConnection { // for (final RemoteRefUpdate u : updates) { final String n = u.getRemoteName(); - if (n.startsWith(Constants.HEADS_PREFIX + "/")) + if (n.startsWith(Constants.R_HEADS)) return n; } return updates.get(0).getRemoteName(); -- 2.11.4.GIT