X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=receive-pack.c;h=ea2dbd4e3398ca90823dcd453cbb52c5dcea135c;hb=e70866f53a8d31cde6cfff6396ba0d1f64029afb;hp=2a3db16d684e3d7ec9bbdd5f80266eb1e4af6f64;hpb=c40610422e1157e71dbc3c1a2f9e19bbe117962f;p=git.git

diff --git a/receive-pack.c b/receive-pack.c
index 2a3db16d6..ea2dbd4e3 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -2,16 +2,17 @@
 #include "refs.h"
 #include "pkt-line.h"
 #include "run-command.h"
-#include <sys/wait.h>
+#include "commit.h"
+#include "object.h"
 
 static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
 
-static char *unpacker[] = { "unpack-objects", NULL };
+static const char *unpacker[] = { "unpack-objects", NULL };
 
-static int report_status = 0;
+static int report_status;
 
 static char capabilities[] = "report-status";
-static int capabilities_sent = 0;
+static int capabilities_sent;
 
 static int show_ref(const char *path, const unsigned char *sha1)
 {
@@ -40,7 +41,7 @@ struct command {
 	char ref_name[FLEX_ARRAY]; /* more */
 };
 
-static struct command *commands = NULL;
+static struct command *commands;
 
 static int is_all_zeroes(const char *hex)
 {
@@ -128,6 +129,21 @@ static int update(struct command *cmd)
 		return error("unpack should have generated %s, "
 			     "but I can't find it!", new_hex);
 	}
+	if (deny_non_fast_forwards && !is_null_sha1(old_sha1)) {
+		struct commit *old_commit, *new_commit;
+		struct commit_list *bases, *ent;
+
+		old_commit = (struct commit *)parse_object(old_sha1);
+		new_commit = (struct commit *)parse_object(new_sha1);
+		bases = get_merge_bases(old_commit, new_commit, 1);
+		for (ent = bases; ent; ent = ent->next)
+			if (!hashcmp(old_sha1, ent->item->object.sha1))
+				break;
+		free_commit_list(bases);
+		if (!ent)
+			return error("denying non-fast forward;"
+				     " you should pull first");
+	}
 	safe_create_leading_directories(lock_name);
 
 	newfd = open(lock_name, O_CREAT | O_EXCL | O_WRONLY, 0666);
@@ -177,7 +193,7 @@ static void run_update_post_hook(struct command *cmd)
 {
 	struct command *cmd_p;
 	int argc;
-	char **argv;
+	const char **argv;
 
 	if (access(update_post_hook, X_OK) < 0)
 		return;
@@ -190,10 +206,12 @@ static void run_update_post_hook(struct command *cmd)
 	argv[0] = update_post_hook;
 
 	for (argc = 1, cmd_p = cmd; cmd_p; cmd_p = cmd_p->next) {
+		char *p;
 		if (cmd_p->error_string)
 			continue;
-		argv[argc] = xmalloc(strlen(cmd_p->ref_name) + 1);
-		strcpy(argv[argc], cmd_p->ref_name);
+		p = xmalloc(strlen(cmd_p->ref_name) + 1);
+		strcpy(p, cmd_p->ref_name);
+		argv[argc] = p;
 		argc++;
 	}
 	argv[argc] = NULL;
@@ -245,8 +263,8 @@ static void read_head_info(void)
 				report_status = 1;
 		}
 		cmd = xmalloc(sizeof(struct command) + len - 80);
-		memcpy(cmd->old_sha1, old_sha1, 20);
-		memcpy(cmd->new_sha1, new_sha1, 20);
+		hashcpy(cmd->old_sha1, old_sha1);
+		hashcpy(cmd->new_sha1, new_sha1);
 		memcpy(cmd->ref_name, line + 82, len - 81);
 		cmd->error_string = "n/a (unpacker error)";
 		cmd->next = NULL;