From 6927eda61a3ff11e9a096f342078ebb020fc7d48 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 2 Jul 2008 23:58:09 -0400 Subject: [PATCH] Use 'git upload-pack' for local transport and not 'git-upload-pack' Since Git 1.6.0 and later is heading towards moving the dash form of commands out of the user's $PATH and into the libexec directory we may not have 'git-upload-pack' or 'git-receive-pack' in $PATH when the JRE tries to startup C Git for a local transport. Instead we should use the git wrapper, as it can select the right libexec directory and start the correct helper program, or perform the task internally if it is a builtin command. In the future we should eliminate this reliance on C Git for any sort of local transport operation. We have direct filesystem IO available to read from the source repository, so there is little execuse for us to be invoking C Git for this special case. Until we fix it, we should at least try to ensure it works for any user. Signed-off-by: Shawn O. Pearce Signed-off-by: Robin Rosenberg --- .../org/spearce/jgit/transport/TransportLocal.java | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java index b1122675..b41d4afb 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java @@ -59,13 +59,15 @@ import org.spearce.jgit.util.FS; * process. */ class TransportLocal extends PackTransport { + private static final String PWD = "."; + static boolean canHandle(final URIish uri) { if (uri.getHost() != null || uri.getPort() > 0 || uri.getUser() != null || uri.getPass() != null || uri.getPath() == null) return false; if ("file".equals(uri.getScheme()) || uri.getScheme() == null) - return FS.resolve(new File("."), uri.getPath()).isDirectory(); + return FS.resolve(new File(PWD), uri.getPath()).isDirectory(); return false; } @@ -74,7 +76,7 @@ class TransportLocal extends PackTransport { TransportLocal(final Repository local, final URIish uri) { super(local, uri); - File d = FS.resolve(new File("."), uri.getPath()).getAbsoluteFile(); + File d = FS.resolve(new File(PWD), uri.getPath()).getAbsoluteFile(); if (new File(d, ".git").isDirectory()) d = new File(d, ".git"); remoteGitDir = d; @@ -94,8 +96,23 @@ class TransportLocal extends PackTransport { protected Process startProcessWithErrStream(final String cmd) throws TransportException { try { - final Process proc = Runtime.getRuntime().exec( - new String[] { cmd, "." }, null, remoteGitDir); + final String[] args; + final Process proc; + + if (cmd.startsWith("git-")) { + args = new String[] { "git", cmd.substring(4), PWD }; + } else { + final int gitspace = cmd.indexOf("git "); + if (gitspace >= 0) { + final String git = cmd.substring(0, gitspace + 3); + final String subcmd = cmd.substring(gitspace + 4); + args = new String[] { git, subcmd, PWD }; + } else { + args = new String[] { cmd, PWD }; + } + } + + proc = Runtime.getRuntime().exec(args, null, remoteGitDir); new StreamRewritingThread(cmd, proc.getErrorStream()).start(); return proc; } catch (IOException err) { -- 2.11.4.GIT