diff options
| author | Shawn Pearce <sop@google.com> | 2014-08-13 16:02:57 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2014-08-13 16:02:57 -0400 |
| commit | b1bea5411354ef257b832c83b3f2fc0b3af1da77 (patch) | |
| tree | 0000b795f69acc7bd797538e77fa62630f40f462 | |
| parent | d70419ab0091a2bf7b2b0765e0eaa152ead0b8cc (diff) | |
| parent | 38a24bc7990bfa76e5dbd905434341a28e8e543f (diff) | |
| download | jgit-b1bea5411354ef257b832c83b3f2fc0b3af1da77.tar.gz jgit-b1bea5411354ef257b832c83b3f2fc0b3af1da77.zip | |
Merge "Tweak the handling of remote url in jgit repo."
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index d8e4c1f9ee..57514a203d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -418,24 +418,19 @@ public class RepoCommand extends GitCommand<RevCommit> { else throw new SAXException(RepoText.get().errorNoDefault); } - final String remoteUrl; + String remoteUrl; try { - URI uri = new URI(remotes.get(defaultRemote)); - if (uri.getHost() != null) { - // This is not relative path, no need for baseUrl. - remoteUrl = uri.toString(); - } else { - uri = new URI(baseUrl); - remoteUrl = uri.resolve( - remotes.get(defaultRemote)).toString(); - } + URI uri = new URI(baseUrl); + remoteUrl = uri.resolve(remotes.get(defaultRemote)).toString(); + if (!remoteUrl.endsWith("/")) + remoteUrl = remoteUrl + "/"; } catch (URISyntaxException e) { throw new SAXException(e); } removeNotInGroup(); removeOverlaps(); for (Project proj : projects) { - command.addSubmodule(remoteUrl + "/" + proj.name, + command.addSubmodule(remoteUrl + proj.name, proj.path, proj.revision == null ? defaultRevision : proj.revision, |