X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=receive-pack.c;h=8f157bc3f0ef1f9d96bca18fc81854fc24bff936;hb=69779a562a171d9b70bbb17b89e076bd6b16ae6c;hp=13d0b668f0a2103cf753ffd519dcaf53f7291341;hpb=f3a3214e83be2905c57eff5d9035d169cae4644e;p=git.git

diff --git a/receive-pack.c b/receive-pack.c
index 13d0b668..8f157bc3 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -1,97 +1,180 @@
 #include "cache.h"
+#include "refs.h"
 #include "pkt-line.h"
+#include "run-command.h"
 #include <sys/wait.h>
 
-static const char receive_pack_usage[] = "git-receive-pack [--unpack=executable] <git-dir> [heads]";
+static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
 
-static const char *unpacker = "git-unpack-objects";
+static const char unpacker[] = "git-unpack-objects";
 
-static int path_match(const char *path, int nr, char **match)
+static int show_ref(const char *path, const unsigned char *sha1)
 {
-	int i;
-	int pathlen = strlen(path);
+	packet_write(1, "%s %s\n", sha1_to_hex(sha1), path);
+	return 0;
+}
 
-	for (i = 0; i < nr; i++) {
-		char *s = match[i];
-		int len = strlen(s);
+static void write_head_info(void)
+{
+	for_each_ref(show_ref);
+}
 
-		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;
+struct command {
+	struct command *next;
+	unsigned char updated;
+	unsigned char old_sha1[20];
+	unsigned char new_sha1[20];
+	char ref_name[0];
+};
+
+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 void show_ref(const char *path, unsigned char *sha1)
+static int verify_old_ref(const char *name, char *hex_contents)
 {
-	packet_write(1, "%s %s\n", sha1_to_hex(sha1), path);
+	int fd, ret;
+	char buffer[60];
+
+	if (is_all_zeroes(hex_contents))
+		return 0;
+	fd = open(name, O_RDONLY);
+	if (fd < 0)
+		return -1;
+	ret = read(fd, buffer, 40);
+	close(fd);
+	if (ret != 40)
+		return -1;
+	if (memcmp(buffer, hex_contents, 40))
+		return -1;
+	return 0;
 }
 
-static int read_ref(const char *path, unsigned char *sha1)
+static char update_hook[] = "hooks/update";
+
+static int run_update_hook(const char *refname,
+			   char *old_hex, char *new_hex)
 {
-	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);
+	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:
+		die("hook fork failed");
+	case -ERR_RUN_COMMAND_EXEC:
+		die("hook execute failed");
+	case -ERR_RUN_COMMAND_WAITPID:
+		die("waitpid failed");
+	case -ERR_RUN_COMMAND_WAITPID_WRONG_PID:
+		die("waitpid is confused");
+	case -ERR_RUN_COMMAND_WAITPID_SIGNAL:
+		fprintf(stderr, "%s died of signal", update_hook);
+		return -1;
+	case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
+		die("%s died strangely", update_hook);
+	default:
+		error("%s exited with error code %d", update_hook, -code);
+		return -code;
 	}
-	return ret;
 }
 
-static void write_head_info(const char *base, int nr, char **match)
+static int update(const char *name,
+		  unsigned char *old_sha1, unsigned char *new_sha1)
 {
-	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 (nr && !path_match(path, nr, match))
-				continue;
-			show_ref(path, sha1);
-		}
-		free(path);
-		closedir(dir);
+	char new_hex[60], *old_hex, *lock_name;
+	int newfd, namelen, written;
+
+	if (!strncmp(name, "refs/", 5) && check_ref_format(name + 5))
+		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));
+	old_hex = sha1_to_hex(old_sha1);
+	if (!has_sha1_file(new_sha1))
+		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)
+		return error("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);
+		return error("unable to write %s", lock_name);
+	}
+	if (verify_old_ref(name, old_hex) < 0) {
+		unlink(lock_name);
+		return error("%s changed during push", name);
+	}
+	if (run_update_hook(name, old_hex, new_hex)) {
+		unlink(lock_name);
+		return error("hook declined to update %s\n", name);
+	}
+	else if (rename(lock_name, name) < 0) {
+		unlink(lock_name);
+		return error("unable to replace %s", name);
+	}
+	else {
+		fprintf(stderr, "%s: %s -> %s\n", name, old_hex, new_hex);
+		return 0;
 	}
 }
 
-struct line {
-	struct line *next;
-	char data[0];
-};
+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;
 
-struct line *commands = NULL;
+	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->updated)
+			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->updated)
+			continue;
+		argv[argc] = xmalloc(strlen(cmd_p->ref_name) + 1);
+		strcpy(argv[argc], cmd_p->ref_name);
+		argc++;
+	}
+	argv[argc] = NULL;
+	run_command_v(argc, argv);
+}
 
 /*
  * This gets called after(if) we've successfully
@@ -99,111 +182,110 @@ struct line *commands = NULL;
  */
 static void execute_commands(void)
 {
-	struct line *line = commands;
+	struct command *cmd = commands;
 
-	while (line) {
-		fprintf(stderr, "%s", line->data);
-		line = line->next;
+	while (cmd) {
+		cmd->updated = !update(cmd->ref_name,
+				       cmd->old_sha1, cmd->new_sha1);
+		cmd = cmd->next;
 	}
+	run_update_post_hook(commands);
 }
 
 static void read_head_info(void)
 {
-	struct line **p = &commands;
+	struct command **p = &commands;
 	for (;;) {
 		static char line[1000];
-		int len = packet_read_line(0, line, sizeof(line));
-		struct line *n;
+		unsigned char old_sha1[20], new_sha1[20];
+		struct command *cmd;
+		int len;
+
+		len = packet_read_line(0, line, sizeof(line));
 		if (!len)
 			break;
-		n = xmalloc(sizeof(struct line) + len);
-		n->next = NULL;
-		memcpy(n->data, line + 4, len - 3);
-		*p = n;
-		p = &n->next;
+		if (line[len-1] == '\n')
+			line[--len] = 0;
+		if (len < 83 ||
+		    line[40] != ' ' ||
+		    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);
+		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->next = NULL;
+		*p = cmd;
+		p = &cmd->next;
 	}
 }
 
 static void unpack(void)
 {
-	pid_t pid = fork();
-
-	if (pid < 0)
+	int code = run_command(unpacker, NULL);
+	switch (code) {
+	case 0:
+		return;
+	case -ERR_RUN_COMMAND_FORK:
 		die("unpack fork failed");
-	if (!pid) {
-		setenv("GIT_DIR", ".", 1);
-		execlp(unpacker, unpacker, NULL);
+	case -ERR_RUN_COMMAND_EXEC:
 		die("unpack execute failed");
-	}
-
-	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;
+	case -ERR_RUN_COMMAND_WAITPID:
+		die("waitpid failed");
+	case -ERR_RUN_COMMAND_WAITPID_WRONG_PID:
+		die("waitpid is confused");
+	case -ERR_RUN_COMMAND_WAITPID_SIGNAL:
+		die("%s died of signal", unpacker);
+	case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
+		die("%s died strangely", unpacker);
+	default:
+		die("%s exited with error code %d", unpacker, -code);
 	}
 }
 
 int main(int argc, char **argv)
 {
-	int i, nr_heads = 0;
+	int i;
 	const char *dir = NULL;
-	char **heads = NULL;
 
 	argv++;
 	for (i = 1; i < argc; i++) {
 		const 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)
+		if (chdir(mkpath("%s.git", dir)) < 0)
 			die("unable to cd to %s", dir);
 	}
 
 	/* If we have a ".git" directory, chdir to it */
 	chdir(".git");
+	putenv("GIT_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();
-	unpack();
-	execute_commands();
+	if (commands) {
+		unpack();
+		execute_commands();
+	}
 	return 0;
 }