From dba385bb3ed541c4d18e2b8080960eee358394fa Mon Sep 17 00:00:00 2001 From: Daniel Barkalow Date: Fri, 3 Jun 2005 17:43:52 -0400 Subject: [PATCH] ssh-protocol version, command types, response code This patch makes an incompatible change to the protocol used by rpull/rpush which will let it be extended in the future without incompatible changes. Signed-off-by: Daniel Barkalow Signed-off-by: Linus Torvalds --- rpull.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'rpull.c') diff --git a/rpull.c b/rpull.c index 8b3322fe0..f4ab89836 100644 --- a/rpull.c +++ b/rpull.c @@ -6,16 +6,39 @@ 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; @@ -48,6 +71,9 @@ int main(int argc, char **argv) if (setup_connection(&fd_in, &fd_out, "git-rpush", url, arg, argv + 1)) return 1; + if (get_version()) + return 1; + if (pull(commit_id)) return 1; -- cgit v1.2.1