diff options
| author | Sven Verdoolaege <skimo@liacs.nl> | 2005-06-27 21:03:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 15:27:50 -0700 |
| commit | ee85cbc6887d6ae4eb09a3e2c7319f66ae7c9034 (patch) | |
| tree | d4c87459bc57b9594e8b01e2bc286d0275ce3ca3 | |
| parent | e2efb676ef0e70364f130c4097b7b9d67804753f (diff) | |
| download | git-ee85cbc6887d6ae4eb09a3e2c7319f66ae7c9034.tar.gz git-ee85cbc6887d6ae4eb09a3e2c7319f66ae7c9034.tar.xz | |
[PATCH] git-ssh-pull: commit-id consistency
In contrast to other plumbing tools, git-ssh-push only
allow a very restrictive form of commit-id filenames.
This patch removes this restriction.
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | Documentation/git-ssh-push.txt | 2 | ||||
| -rw-r--r-- | ssh-push.c | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/Documentation/git-ssh-push.txt b/Documentation/git-ssh-push.txt index c55ce7dd6..69013fd44 100644 --- a/Documentation/git-ssh-push.txt +++ b/Documentation/git-ssh-push.txt @@ -20,7 +20,7 @@ git-ssh-pull, aside from which end you run it on. OPTIONS ------- commit-id:: - Either the hash or the filename under $GIT_DIR/refs/ to push. + Id of commit to push. -c:: Get the commit objects. diff --git a/ssh-push.c b/ssh-push.c index 12fb9fccb..db69c889e 100644 --- a/ssh-push.c +++ b/ssh-push.c @@ -2,6 +2,8 @@ #include "rsh.h" #include "refs.h" +#include <string.h> + unsigned char local_version = 1; unsigned char remote_version = 0; @@ -103,6 +105,9 @@ void service(int fd_in, int fd_out) { } 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; @@ -110,18 +115,23 @@ int main(int argc, char **argv) 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] [-w ref] commit-id url"); - return 1; - } + if (argc < arg + 2) + usage(ssh_push_usage); commit_id = argv[arg]; url = argv[arg + 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; |