projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Teach git push .git/branches shorthand
[git.git]
/
rsh.c
diff --git
a/rsh.c
b/rsh.c
index
4d6a90b
..
bcb1c80
100644
(file)
--- a/
rsh.c
+++ b/
rsh.c
@@
-1,13
+1,14
@@
#include "rsh.h"
#include <string.h>
#include "rsh.h"
#include <string.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include "cache.h"
#define COMMAND_SIZE 4096
#include <sys/socket.h>
#include "cache.h"
#define COMMAND_SIZE 4096
-int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
+int setup_connection(int *fd_in, int *fd_out, c
onst c
har *remote_prog,
char *url, int rmt_argc, char **rmt_argv)
{
char *host;
char *url, int rmt_argc, char **rmt_argv)
{
char *host;
@@
-24,19
+25,23
@@
int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
}
host = strstr(url, "//");
}
host = strstr(url, "//");
- if (!host) {
- return error("Bad URL: %s", url);
+ if (host) {
+ host += 2;
+ path = strchr(host, '/');
+ } else {
+ host = url;
+ path = strchr(host, ':');
+ if (path)
+ *(path++) = '\0';
}
}
- host += 2;
- path = strchr(host, '/');
if (!path) {
return error("Bad URL: %s", url);
}
if (!path) {
return error("Bad URL: %s", url);
}
- *(path++) = '\0';
- /* ssh <host> 'cd /<path>; stdio-pull <arg...> <commit-id>' */
+ /* ssh <host> 'cd <path>; stdio-pull <arg...> <commit-id>' */
snprintf(command, COMMAND_SIZE,
snprintf(command, COMMAND_SIZE,
- "cd /%s; SHA1_FILE_DIRECTORY=objects %s",
- path, remote_prog);
+ "%s='%s' %s",
+ GIT_DIR_ENVIRONMENT, path, remote_prog);
+ *path = '\0';
posn = command + strlen(command);
for (i = 0; i < rmt_argc; i++) {
*(posn++) = ' ';
posn = command + strlen(command);
for (i = 0; i < rmt_argc; i++) {
*(posn++) = ' ';
@@
-47,14
+52,20
@@
int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
}
}
strcpy(posn, " -");
}
}
strcpy(posn, " -");
- if (socketpair(AF_
LOCAL
, SOCK_STREAM, 0, sv)) {
+ if (socketpair(AF_
UNIX
, SOCK_STREAM, 0, sv)) {
return error("Couldn't create socket");
}
if (!fork()) {
return error("Couldn't create socket");
}
if (!fork()) {
+ const char *ssh = getenv("GIT_SSH") ? : "ssh";
+ const char *ssh_basename = strrchr(ssh, '/');
+ if (!ssh_basename)
+ ssh_basename = ssh;
+ else
+ ssh_basename++;
close(sv[1]);
dup2(sv[0], 0);
dup2(sv[0], 1);
close(sv[1]);
dup2(sv[0], 0);
dup2(sv[0], 1);
- execlp(
"ssh", "ssh"
, host, command, NULL);
+ execlp(
ssh, ssh_basename
, host, command, NULL);
}
close(sv[0]);
*fd_in = sv[1];
}
close(sv[0]);
*fd_in = sv[1];