Merge "Better way to handle relative URLs in manifest XML"

org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java

@@ -351,8 +351,8 @@ public class RepoCommand extends GitCommand<RevCommit> {
 			}
 			final String remoteUrl;
 			try {
-				URI uri = new URI(String.format("%s/%s/", baseUrl, remotes.get(defaultRemote))); //$NON-NLS-1$
+				URI uri = new URI(baseUrl);
-				remoteUrl = uri.normalize().toString();
+				remoteUrl = uri.resolve(remotes.get(defaultRemote)).toString();
 			} catch (URISyntaxException e) {
 				throw new SAXException(e);
 			}