summaryrefslogtreecommitdiff
path: root/ssh-pull.c
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2005-06-06 20:43:27 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-07 00:12:47 (GMT)
commitc7c4bbe63193f580abd2460e96dd7e65f2d4904c (patch)
tree14531858eab47c235e3c9784919a7e5894384480 /ssh-pull.c
parentcd541a68b38cead87f5fa69d5331c467bce71656 (diff)
downloadgit-c7c4bbe63193f580abd2460e96dd7e65f2d4904c.zip
git-c7c4bbe63193f580abd2460e96dd7e65f2d4904c.tar.gz
git-c7c4bbe63193f580abd2460e96dd7e65f2d4904c.tar.bz2
[PATCH] -w support for git-ssh-pull/push
This adds support for -w to git-ssh-pull and git-ssh-push to make receiving side write the commit that was transferred to a reference file. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'ssh-pull.c')
-rw-r--r--ssh-pull.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/ssh-pull.c b/ssh-pull.c
index a426342..c2cb59a 100644
--- a/ssh-pull.c
+++ b/ssh-pull.c
@@ -2,6 +2,7 @@
#include "commit.h"
#include "rsh.h"
#include "pull.h"
+#include "refs.h"
static int fd_in;
static int fd_out;
@@ -41,7 +42,15 @@ int get_version(void)
int fetch_ref(char *ref, unsigned char *sha1)
{
- return -1;
+ signed char remote;
+ char type = 'r';
+ write(fd_out, &type, 1);
+ write(fd_out, ref, strlen(ref) + 1);
+ read(fd_in, &remote, 1);
+ if (remote < 0)
+ return remote;
+ read(fd_in, sha1, 20);
+ return 0;
}
int main(int argc, char **argv)
@@ -65,11 +74,14 @@ int main(int argc, char **argv)
get_history = 1;
} else if (argv[arg][1] == 'v') {
get_verbosely = 1;
+ } else if (argv[arg][1] == 'w') {
+ write_ref = argv[arg + 1];
+ arg++;
}
arg++;
}
if (argc < arg + 2) {
- usage("git-ssh-pull [-c] [-t] [-a] [-v] [-d] [--recover] commit-id url");
+ usage("git-ssh-pull [-c] [-t] [-a] [-v] [-d] [--recover] [-w ref] commit-id url");
return 1;
}
commit_id = argv[arg];