[JGIT PATCH 6/8] Support 'git upload-pack' and 'git receive-pack' over SSH
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Jul 1, 2008, 03:04 UTC
- Message-ID
- <1214881445-3931-7-git-send-email-spearce@spearce.org>
- In-Reply-To
- <1214881445-3931-6-git-send-email-spearce@spearce.org>
Within the next 6 months C git clients will begin asking remote servers for 'git $command' rather than 'git-$command' when using the SSH transport. This change is to allow the C git programs to be removed from the user's $PATH, leaving only the git wrapper binary.
For the first 6 months after C git 1.6.0 gets released clients will continue to ask for 'git-$command' but users may change that behavior by specifically asking for 'git $command' in remote.$name.uploadpack or remote.$name.receivepack. Later clients (including jgit) will change to ask for 'git $command' by default.
If we are asking for 'git $command' we cannot quote this as a single command with a space in the path. We split on the whitespace and quote both sides (if necessary) to protect the strings from the shell.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- .../spearce/jgit/transport/TransportGitSsh.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportGitSsh.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportGitSsh.java index caf531d..1bbdf04 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportGitSsh.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportGitSsh.java @@ -182,7 +182,13 @@ class TransportGitSsh extends PackTransport { path = (uri.getPath().substring(1)); final StringBuilder cmd = new StringBuilder(); - sqMinimal(cmd, exe); + final int gitspace = exe.indexOf("git "); + if (gitspace >= 0) { + sqMinimal(cmd, exe.substring(0, gitspace + 3)); + cmd.append(' '); + sqMinimal(cmd, exe.substring(gitspace + 4)); + } else + sqMinimal(cmd, exe); cmd.append(' '); sqAlways(cmd, path); channel.setCommand(cmd.toString());
-- 1.5.6.74.g8a5e