X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=receive-pack.c;h=2a3db16d684e3d7ec9bbdd5f80266eb1e4af6f64;hb=52e8a6e9bf92a38015ab8f6d19dabeff7acc0651;hp=7ce5f1e24a57f673e614c6bb3d75480e272d37da;hpb=2eca23daf5ab7c921c544d86cd53707f8b4ff9a4;p=git.git diff --git a/receive-pack.c b/receive-pack.c index 7ce5f1e2..2a3db16d 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -1,107 +1,63 @@ #include "cache.h" +#include "refs.h" #include "pkt-line.h" +#include "run-command.h" #include -static const char receive_pack_usage[] = "git-receive-pack [--unpack=executable] [heads]"; +static const char receive_pack_usage[] = "git-receive-pack "; -static const char *unpacker = "git-unpack-objects"; +static char *unpacker[] = { "unpack-objects", NULL }; -static int path_match(const char *path, int nr, char **match) -{ - int i; - int pathlen = strlen(path); +static int report_status = 0; - for (i = 0; i < nr; i++) { - char *s = match[i]; - int len = strlen(s); +static char capabilities[] = "report-status"; +static int capabilities_sent = 0; - if (!len || len > pathlen) - continue; - if (memcmp(path + pathlen - len, s, len)) - continue; - if (pathlen > len && path[pathlen - len - 1] != '/') - continue; - *s = 0; - return 1; - } - return 0; -} - -static void show_ref(const char *path, unsigned char *sha1) +static int show_ref(const char *path, const unsigned char *sha1) { - packet_write(1, "%s %s\n", sha1_to_hex(sha1), path); + if (capabilities_sent) + packet_write(1, "%s %s\n", sha1_to_hex(sha1), path); + else + packet_write(1, "%s %s%c%s\n", + sha1_to_hex(sha1), path, 0, capabilities); + capabilities_sent = 1; + return 0; } -static int read_ref(const char *path, unsigned char *sha1) +static void write_head_info(void) { - int ret = -1; - int fd = open(path, O_RDONLY); - - if (fd >= 0) { - char buffer[60]; - if (read(fd, buffer, sizeof(buffer)) >= 40) - ret = get_sha1_hex(buffer, sha1); - close(fd); - } - return ret; -} + for_each_ref(show_ref); + if (!capabilities_sent) + show_ref("capabilities^{}", null_sha1); -static void write_head_info(const char *base, int nr, char **match) -{ - DIR *dir = opendir(base); - - if (dir) { - struct dirent *de; - int baselen = strlen(base); - char *path = xmalloc(baselen + 257); - memcpy(path, base, baselen); - - while ((de = readdir(dir)) != NULL) { - char sha1[20]; - struct stat st; - int namelen; - - if (de->d_name[0] == '.') - continue; - namelen = strlen(de->d_name); - if (namelen > 255) - continue; - memcpy(path + baselen, de->d_name, namelen+1); - if (lstat(path, &st) < 0) - continue; - if (S_ISDIR(st.st_mode)) { - path[baselen + namelen] = '/'; - path[baselen + namelen + 1] = 0; - write_head_info(path, nr, match); - continue; - } - if (read_ref(path, sha1) < 0) - continue; - if (!has_sha1_file(sha1)) - continue; - if (nr && !path_match(path, nr, match)) - continue; - show_ref(path, sha1); - } - free(path); - closedir(dir); - } } struct command { struct command *next; + const char *error_string; unsigned char old_sha1[20]; unsigned char new_sha1[20]; - char ref_name[0]; + char ref_name[FLEX_ARRAY]; /* more */ }; -struct command *commands = NULL; +static struct command *commands = NULL; + +static int is_all_zeroes(const char *hex) +{ + int i; + for (i = 0; i < 40; i++) + if (*hex++ != '0') + return 0; + return 1; +} static int verify_old_ref(const char *name, char *hex_contents) { int fd, ret; char buffer[60]; + if (is_all_zeroes(hex_contents)) + return 0; fd = open(name, O_RDONLY); if (fd < 0) return -1; @@ -114,43 +70,135 @@ static int verify_old_ref(const char *name, char *hex_contents) return 0; } -static void update(const char *name, unsigned char *old_sha1, unsigned char *new_sha1) +static char update_hook[] = "hooks/update"; + +static int run_update_hook(const char *refname, + char *old_hex, char *new_hex) { + int code; + + if (access(update_hook, X_OK) < 0) + return 0; + code = run_command(update_hook, refname, old_hex, new_hex, NULL); + switch (code) { + case 0: + return 0; + case -ERR_RUN_COMMAND_FORK: + return error("hook fork failed"); + case -ERR_RUN_COMMAND_EXEC: + return error("hook execute failed"); + case -ERR_RUN_COMMAND_WAITPID: + return error("waitpid failed"); + case -ERR_RUN_COMMAND_WAITPID_WRONG_PID: + return error("waitpid is confused"); + case -ERR_RUN_COMMAND_WAITPID_SIGNAL: + return error("%s died of signal", update_hook); + case -ERR_RUN_COMMAND_WAITPID_NOEXIT: + return error("%s died strangely", update_hook); + default: + error("%s exited with error code %d", update_hook, -code); + return -code; + } +} + +static int update(struct command *cmd) +{ + const char *name = cmd->ref_name; + unsigned char *old_sha1 = cmd->old_sha1; + unsigned char *new_sha1 = cmd->new_sha1; char new_hex[60], *old_hex, *lock_name; int newfd, namelen, written; + cmd->error_string = NULL; + if (!strncmp(name, "refs/", 5) && check_ref_format(name + 5)) { + cmd->error_string = "funny refname"; + return error("refusing to create funny ref '%s' locally", + name); + } + namelen = strlen(name); lock_name = xmalloc(namelen + 10); memcpy(lock_name, name, namelen); memcpy(lock_name + namelen, ".lock", 6); strcpy(new_hex, sha1_to_hex(new_sha1)); - new_hex[40] = '\n'; - new_hex[41] = 0; old_hex = sha1_to_hex(old_sha1); - if (!has_sha1_file(new_sha1)) - die("unpack should have generated %s, but I can't find it!", new_hex); + if (!has_sha1_file(new_sha1)) { + cmd->error_string = "bad pack"; + return error("unpack should have generated %s, " + "but I can't find it!", new_hex); + } + safe_create_leading_directories(lock_name); + + newfd = open(lock_name, O_CREAT | O_EXCL | O_WRONLY, 0666); + if (newfd < 0) { + cmd->error_string = "can't lock"; + return error("unable to create %s (%s)", + lock_name, strerror(errno)); + } - newfd = open(lock_name, O_CREAT | O_EXCL | O_WRONLY, 0644); - if (newfd < 0) - die("unable to create %s (%s)", lock_name, strerror(errno)); + /* Write the ref with an ending '\n' */ + new_hex[40] = '\n'; + new_hex[41] = 0; written = write(newfd, new_hex, 41); + /* Remove the '\n' again */ + new_hex[40] = 0; + close(newfd); if (written != 41) { unlink(lock_name); - die("unable to write %s", lock_name); + cmd->error_string = "can't write"; + return error("unable to write %s", lock_name); } if (verify_old_ref(name, old_hex) < 0) { unlink(lock_name); - die("%s changed during push", name); + cmd->error_string = "raced"; + return error("%s changed during push", name); } - if (rename(lock_name, name) < 0) { + if (run_update_hook(name, old_hex, new_hex)) { unlink(lock_name); - die("unable to replace %s", name); + cmd->error_string = "hook declined"; + return error("hook declined to update %s", name); + } + else if (rename(lock_name, name) < 0) { + unlink(lock_name); + cmd->error_string = "can't rename"; + return error("unable to replace %s", name); + } + else { + fprintf(stderr, "%s: %s -> %s\n", name, old_hex, new_hex); + return 0; } - fprintf(stderr, "%s: %s -> %s\n", name, old_hex, new_hex); } +static char update_post_hook[] = "hooks/post-update"; + +static void run_update_post_hook(struct command *cmd) +{ + struct command *cmd_p; + int argc; + char **argv; + + if (access(update_post_hook, X_OK) < 0) + return; + for (argc = 1, cmd_p = cmd; cmd_p; cmd_p = cmd_p->next) { + if (cmd_p->error_string) + continue; + argc++; + } + argv = xmalloc(sizeof(*argv) * (1 + argc)); + argv[0] = update_post_hook; + + for (argc = 1, cmd_p = cmd; cmd_p; cmd_p = cmd_p->next) { + if (cmd_p->error_string) + continue; + argv[argc] = xmalloc(strlen(cmd_p->ref_name) + 1); + strcpy(argv[argc], cmd_p->ref_name); + argc++; + } + argv[argc] = NULL; + run_command_v_opt(argc, argv, RUN_COMMAND_NO_STDIO); +} /* * This gets called after(if) we've successfully @@ -161,9 +209,10 @@ static void execute_commands(void) struct command *cmd = commands; while (cmd) { - update(cmd->ref_name, cmd->old_sha1, cmd->new_sha1); + update(cmd); cmd = cmd->next; } + run_update_post_hook(commands); } static void read_head_info(void) @@ -173,7 +222,8 @@ static void read_head_info(void) static char line[1000]; unsigned char old_sha1[20], new_sha1[20]; struct command *cmd; - int len; + char *refname; + int len, reflen; len = packet_read_line(0, line, sizeof(line)); if (!len) @@ -185,99 +235,104 @@ static void read_head_info(void) line[81] != ' ' || get_sha1_hex(line, old_sha1) || get_sha1_hex(line + 41, new_sha1)) - die("protocol error: expected old/new/ref, got '%s'", line); + die("protocol error: expected old/new/ref, got '%s'", + line); + + refname = line + 82; + reflen = strlen(refname); + if (reflen + 82 < len) { + if (strstr(refname + reflen + 1, "report-status")) + report_status = 1; + } cmd = xmalloc(sizeof(struct command) + len - 80); memcpy(cmd->old_sha1, old_sha1, 20); memcpy(cmd->new_sha1, new_sha1, 20); memcpy(cmd->ref_name, line + 82, len - 81); + cmd->error_string = "n/a (unpacker error)"; cmd->next = NULL; *p = cmd; p = &cmd->next; } } -static void unpack(void) +static const char *unpack(int *error_code) { - pid_t pid = fork(); - - if (pid < 0) - die("unpack fork failed"); - if (!pid) { - execlp(unpacker, unpacker, NULL); - die("unpack execute failed"); + int code = run_command_v_opt(1, unpacker, RUN_GIT_CMD); + + *error_code = 0; + switch (code) { + case 0: + return NULL; + case -ERR_RUN_COMMAND_FORK: + return "unpack fork failed"; + case -ERR_RUN_COMMAND_EXEC: + return "unpack execute failed"; + case -ERR_RUN_COMMAND_WAITPID: + return "waitpid failed"; + case -ERR_RUN_COMMAND_WAITPID_WRONG_PID: + return "waitpid is confused"; + case -ERR_RUN_COMMAND_WAITPID_SIGNAL: + return "unpacker died of signal"; + case -ERR_RUN_COMMAND_WAITPID_NOEXIT: + return "unpacker died strangely"; + default: + *error_code = -code; + return "unpacker exited with error code"; } +} - for (;;) { - int status, code; - int retval = waitpid(pid, &status, 0); - - if (retval < 0) { - if (errno == EINTR) - continue; - die("waitpid failed (%s)", strerror(retval)); - } - if (retval != pid) - die("waitpid is confused"); - if (WIFSIGNALED(status)) - die("%s died of signal %d", unpacker, WTERMSIG(status)); - if (!WIFEXITED(status)) - die("%s died out of really strange complications", unpacker); - code = WEXITSTATUS(status); - if (code) - die("%s exited with error code %d", unpacker, code); - return; +static void report(const char *unpack_status) +{ + struct command *cmd; + packet_write(1, "unpack %s\n", + unpack_status ? unpack_status : "ok"); + for (cmd = commands; cmd; cmd = cmd->next) { + if (!cmd->error_string) + packet_write(1, "ok %s\n", + cmd->ref_name); + else + packet_write(1, "ng %s %s\n", + cmd->ref_name, cmd->error_string); } + packet_flush(1); } int main(int argc, char **argv) { - int i, nr_heads = 0; - const char *dir = NULL; - char **heads = NULL; + int i; + char *dir = NULL; argv++; for (i = 1; i < argc; i++) { - const char *arg = *argv++; + char *arg = *argv++; if (*arg == '-') { - if (!strncmp(arg, "--unpack=", 9)) { - unpacker = arg+9; - continue; - } /* Do flag handling here */ usage(receive_pack_usage); } + if (dir) + usage(receive_pack_usage); dir = arg; - heads = argv; - nr_heads = argc - i - 1; - break; } if (!dir) usage(receive_pack_usage); - /* chdir to the directory. If that fails, try appending ".git" */ - if (chdir(dir) < 0) { - static char path[PATH_MAX]; - snprintf(path, sizeof(path), "%s.git", dir); - if (chdir(path) < 0) - die("unable to cd to %s", dir); - } - - /* If we have a ".git" directory, chdir to it */ - chdir(".git"); - setenv("GIT_DIR", ".", 1); + if(!enter_repo(dir, 0)) + die("'%s': unable to chdir or not a git archive", dir); - if (access("objects", X_OK) < 0 || access("refs/heads", X_OK) < 0) - die("%s doesn't appear to be a git directory", dir); - write_head_info("refs/", nr_heads, heads); + write_head_info(); /* EOF */ packet_flush(1); read_head_info(); if (commands) { - unpack(); - execute_commands(); + int code; + const char *unpack_status = unpack(&code); + if (!unpack_status) + execute_commands(); + if (report_status) + report(unpack_status); } return 0; }