[PATCH] rename git-rpush and git-rpull to git-ssh-push and git-ssh-pull
In preparation for 1.0 release, this makes the command names consistent with others in git-*-pull family. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
dc93841715
commit
418aaf847a
83
ssh-pull.c
Normal file
83
ssh-pull.c
Normal file
@ -0,0 +1,83 @@
|
||||
#include "cache.h"
|
||||
#include "commit.h"
|
||||
#include "rsh.h"
|
||||
#include "pull.h"
|
||||
|
||||
static int fd_in;
|
||||
static int fd_out;
|
||||
|
||||
static unsigned char remote_version = 0;
|
||||
static unsigned char local_version = 1;
|
||||
|
||||
int fetch(unsigned char *sha1)
|
||||
{
|
||||
int ret;
|
||||
signed char remote;
|
||||
char type = 'o';
|
||||
if (has_sha1_file(sha1))
|
||||
return 0;
|
||||
write(fd_out, &type, 1);
|
||||
write(fd_out, sha1, 20);
|
||||
if (read(fd_in, &remote, 1) < 1)
|
||||
return -1;
|
||||
if (remote < 0)
|
||||
return remote;
|
||||
ret = write_sha1_from_fd(sha1, fd_in);
|
||||
if (!ret)
|
||||
pull_say("got %s\n", sha1_to_hex(sha1));
|
||||
return ret;
|
||||
}
|
||||
|
||||
int get_version(void)
|
||||
{
|
||||
char type = 'v';
|
||||
write(fd_out, &type, 1);
|
||||
write(fd_out, &local_version, 1);
|
||||
if (read(fd_in, &remote_version, 1) < 1) {
|
||||
return error("Couldn't read version from remote end");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
char *commit_id;
|
||||
char *url;
|
||||
int arg = 1;
|
||||
|
||||
while (arg < argc && argv[arg][0] == '-') {
|
||||
if (argv[arg][1] == 't') {
|
||||
get_tree = 1;
|
||||
} else if (argv[arg][1] == 'c') {
|
||||
get_history = 1;
|
||||
} else if (argv[arg][1] == 'd') {
|
||||
get_delta = 0;
|
||||
} else if (!strcmp(argv[arg], "--recover")) {
|
||||
get_delta = 2;
|
||||
} else if (argv[arg][1] == 'a') {
|
||||
get_all = 1;
|
||||
get_tree = 1;
|
||||
get_history = 1;
|
||||
} else if (argv[arg][1] == 'v') {
|
||||
get_verbosely = 1;
|
||||
}
|
||||
arg++;
|
||||
}
|
||||
if (argc < arg + 2) {
|
||||
usage("git-ssh-pull [-c] [-t] [-a] [-v] [-d] [--recover] commit-id url");
|
||||
return 1;
|
||||
}
|
||||
commit_id = argv[arg];
|
||||
url = argv[arg + 1];
|
||||
|
||||
if (setup_connection(&fd_in, &fd_out, "git-ssh-push", url, arg, argv + 1))
|
||||
return 1;
|
||||
|
||||
if (get_version())
|
||||
return 1;
|
||||
|
||||
if (pull(commit_id))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user