From: Robin Stocker <robin@nibor.org>
Date: Fri, 27 Jul 2012 09:53:51 +0000 (+0200)
Subject: Fix resolving of relative file URIs in TransportLocal
X-Git-Tag: v2.1.0.201209190230-r~42^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F6996%2F1;p=jgit.git

Fix resolving of relative file URIs in TransportLocal

A configured remote url like "../repo" works with C Git.

In JGit, it only worked if Java's current working directory happened to
be the local repository working directory.

Change-Id: I33ba3f81b37d03cf17ca7ae25a90774a27e7e02b
Signed-off-by: Robin Stocker <robin@nibor.org>
---

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportTest.java
index 9899d14d8d..4e7b5e420e 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportTest.java
@@ -58,6 +58,7 @@ import java.util.List;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.SampleDataRepositoryTestCase;
+import org.eclipse.jgit.storage.file.FileRepository;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -213,6 +214,18 @@ public class TransportTest extends SampleDataRepositoryTestCase {
 		assertEquals(ObjectId.zeroId(), tru.getOldObjectId());
 	}
 
+	@Test
+	public void testLocalTransportWithRelativePath() throws Exception {
+		FileRepository other = createWorkRepository();
+		String otherDir = other.getWorkTree().getName();
+
+		RemoteConfig config = new RemoteConfig(db.getConfig(), "other");
+		config.addURI(new URIish("../" + otherDir));
+
+		// Should not throw NoRemoteRepositoryException
+		transport = Transport.open(db, config);
+	}
+
 	@Test
 	public void testSpi() {
 		List<TransportProtocol> protocols = Transport.getTransportProtocols();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java
index 8be940d9d0..5a23ae18d8 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java
@@ -118,10 +118,10 @@ class TransportLocal extends Transport implements PackTransport {
 		@Override
 		public Transport open(URIish uri, Repository local, String remoteName)
 				throws NoRemoteRepositoryException {
+			File localPath = local.isBare() ? local.getDirectory() : local.getWorkTree();
+			File path = local.getFS().resolve(localPath, uri.getPath());
 			// If the reference is to a local file, C Git behavior says
 			// assume this is a bundle, since repositories are directories.
-			//
-			File path = local.getFS().resolve(new File("."), uri.getPath());
 			if (path.isFile())
 				return new TransportBundleFile(local, uri, path);