[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>
This commit is contained in:
Sven Verdoolaege 2005-06-27 21:03:07 +02:00 committed by Linus Torvalds
parent e2efb676ef
commit ee85cbc688
2 changed files with 15 additions and 5 deletions

View File

@ -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.

View File

@ -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;