X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=ssh-push.c;h=db69c889e79da7afac3fc7791000fd31ec61adb5;hb=4d235c8044a638108b67e22f94b2876657130fc8;hp=9994ea7fc098468976c4a95daf972f796d88793b;hpb=418aaf847a8b3ffffb4f777a2dd5262ca5ce0ef7;p=git.git

diff --git a/ssh-push.c b/ssh-push.c
index 9994ea7f..db69c889 100644
--- a/ssh-push.c
+++ b/ssh-push.c
@@ -1,7 +1,8 @@
 #include "cache.h"
 #include "rsh.h"
-#include <sys/socket.h>
-#include <errno.h>
+#include "refs.h"
+
+#include <string.h>
 
 unsigned char local_version = 1;
 unsigned char remote_version = 0;
@@ -9,7 +10,7 @@ unsigned char remote_version = 0;
 int serve_object(int fd_in, int fd_out) {
 	ssize_t size;
 	int posn = 0;
-	char sha1[20];
+	unsigned char sha1[20];
 	unsigned long objsize;
 	void *buf;
 	signed char remote;
@@ -64,6 +65,27 @@ int serve_version(int fd_in, int fd_out)
 	return 0;
 }
 
+int serve_ref(int fd_in, int fd_out)
+{
+	char ref[PATH_MAX];
+	unsigned char sha1[20];
+	int posn = 0;
+	signed char remote = 0;
+	do {
+		if (read(fd_in, ref + posn, 1) < 1)
+			return -1;
+		posn++;
+	} while (ref[posn - 1]);
+	if (get_ref_sha1(ref, sha1))
+		remote = -1;
+	write(fd_out, &remote, 1);
+	if (remote)
+		return 0;
+	write(fd_out, sha1, 20);
+        return 0;
+}
+
+
 void service(int fd_in, int fd_out) {
 	char type;
 	int retval;
@@ -78,25 +100,39 @@ void service(int fd_in, int fd_out) {
 			return;
 		if (type == 'o' && serve_object(fd_in, fd_out))
 			return;
+		if (type == 'r' && serve_ref(fd_in, fd_out))
+			return;
 	} while (1);
 }
 
+static const char *ssh_push_usage =
+	"git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url";
+
 int main(int argc, char **argv)
 {
 	int arg = 1;
         char *commit_id;
         char *url;
 	int fd_in, fd_out;
+	const char *prog = getenv("GIT_SSH_PULL") ? : "git-ssh-pull";
+	unsigned char sha1[20];
+	char hex[41];
+
 	while (arg < argc && argv[arg][0] == '-') {
+		if (argv[arg][1] == 'w')
+			arg++;
                 arg++;
         }
-        if (argc < arg + 2) {
-		usage("git-ssh-push [-c] [-t] [-a] commit-id url");
-                return 1;
-        }
+	if (argc < arg + 2)
+		usage(ssh_push_usage);
 	commit_id = argv[arg];
 	url = argv[arg + 1];
-	if (setup_connection(&fd_in, &fd_out, "git-ssh-pull", url, arg, argv + 1))
+	if (get_sha1(commit_id, sha1))
+		usage(ssh_push_usage);
+	memcpy(hex, sha1_to_hex(sha1), sizeof(hex));
+	argv[arg] = hex;
+
+	if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
 		return 1;
 
 	service(fd_in, fd_out);