projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add t/t6003 with some --topo-order tests
[git.git]
/
ssh-push.c
diff --git
a/ssh-push.c
b/ssh-push.c
index
12fb9fc
..
090d6f9
100644
(file)
--- a/
ssh-push.c
+++ b/
ssh-push.c
@@
-2,10
+2,12
@@
#include "rsh.h"
#include "refs.h"
#include "rsh.h"
#include "refs.h"
-unsigned char local_version = 1;
-unsigned char remote_version = 0;
+#include <string.h>
-int serve_object(int fd_in, int fd_out) {
+static unsigned char local_version = 1;
+static unsigned char remote_version = 0;
+
+static int serve_object(int fd_in, int fd_out) {
ssize_t size;
int posn = 0;
unsigned char sha1[20];
ssize_t size;
int posn = 0;
unsigned char sha1[20];
@@
-55,7
+57,7
@@
int serve_object(int fd_in, int fd_out) {
return 0;
}
return 0;
}
-int serve_version(int fd_in, int fd_out)
+
static
int serve_version(int fd_in, int fd_out)
{
if (read(fd_in, &remote_version, 1) < 1)
return -1;
{
if (read(fd_in, &remote_version, 1) < 1)
return -1;
@@
-63,7
+65,7
@@
int serve_version(int fd_in, int fd_out)
return 0;
}
return 0;
}
-int serve_ref(int fd_in, int fd_out)
+
static
int serve_ref(int fd_in, int fd_out)
{
char ref[PATH_MAX];
unsigned char sha1[20];
{
char ref[PATH_MAX];
unsigned char sha1[20];
@@
-84,7
+86,7
@@
int serve_ref(int fd_in, int fd_out)
}
}
-void service(int fd_in, int fd_out) {
+
static
void service(int fd_in, int fd_out) {
char type;
int retval;
do {
char type;
int retval;
do {
@@
-103,6
+105,9
@@
void service(int fd_in, int fd_out) {
} while (1);
}
} 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;
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";
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++;
}
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];
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;
if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
return 1;