X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=send-pack.c;h=0ab135c9881c4d9fa6b82ea80f5e62d2fbf17d28;hb=3e386508f87278610d1892aaaa08cd17907f71c5;hp=633fc471afb10191a1f47874e3e2ff9ebd0a6071;hpb=f88395ac233572b19f67b3a47b9fe024f397a85b;p=git.git

diff --git a/send-pack.c b/send-pack.c
index 633fc471..0ab135c9 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "commit.h"
+#include "tag.h"
 #include "refs.h"
 #include "pkt-line.h"
 
@@ -104,29 +105,53 @@ static int pack_objects(int fd, struct ref *refs)
 	return 0;
 }
 
-static int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
+static void unmark_and_free(struct commit_list *list, unsigned int mark)
 {
-	struct commit *new, *old;
-	struct commit_list *list;
+	while (list) {
+		struct commit_list *temp = list;
+		temp->item->object.flags &= ~mark;
+		list = temp->next;
+		free(temp);
+	}
+}
 
-	if (force_update)
-		return 1;
-	old = lookup_commit_reference(old_sha1);
-	if (!old)
+static int ref_newer(const unsigned char *new_sha1,
+		     const unsigned char *old_sha1)
+{
+	struct object *o;
+	struct commit *old, *new;
+	struct commit_list *list, *used;
+	int found = 0;
+
+	/* Both new and old must be commit-ish and new is descendant of
+	 * old.  Otherwise we require --force.
+	 */
+	o = deref_tag(parse_object(old_sha1));
+	if (!o || o->type != commit_type)
 		return 0;
-	new = lookup_commit_reference(new_sha1);
-	if (!new)
+	old = (struct commit *) o;
+
+	o = deref_tag(parse_object(new_sha1));
+	if (!o || o->type != commit_type)
 		return 0;
+	new = (struct commit *) o;
+
 	if (parse_commit(new) < 0)
 		return 0;
-	list = NULL;
+
+	used = list = NULL;
 	commit_list_insert(new, &list);
 	while (list) {
 		new = pop_most_recent_commit(&list, 1);
-		if (new == old)
-			return 1;
+		commit_list_insert(new, &used);
+		if (new == old) {
+			found = 1;
+			break;
+		}
 	}
-	return 0;
+	unmark_and_free(list, 1);
+	unmark_and_free(used, 1);
+	return found;
 }
 
 static struct ref *local_refs, **local_tail;
@@ -173,13 +198,38 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
 		char old_hex[60], *new_hex;
 		if (!ref->peer_ref)
 			continue;
-		if (!is_zero_sha1(ref->old_sha1)) {
+		if (!memcmp(ref->old_sha1, ref->peer_ref->new_sha1, 20)) {
+			fprintf(stderr, "'%s': up-to-date\n", ref->name);
+			continue;
+		}
+
+		/* This part determines what can overwrite what.
+		 * The rules are:
+		 *
+		 * (0) you can always use --force.
+		 *
+		 * (1) if the old thing does not exist, it is OK.
+		 *
+		 * (2) if you do not have the old thing, you are not allowed
+		 *     to overwrite it; you would not know what you are losing
+		 *     otherwise.
+		 *
+		 * (3) if both new and old are commit-ish, and new is a
+		 *     descendant of old, it is OK.
+		 */
+
+		if (!force_update && !is_zero_sha1(ref->old_sha1)) {
 			if (!has_sha1_file(ref->old_sha1)) {
 				error("remote '%s' object %s does not "
 				      "exist on local",
 				      ref->name, sha1_to_hex(ref->old_sha1));
 				continue;
 			}
+			/* We assume that local is fsck-clean.  Otherwise
+			 * you _could_ have a old tag which points at
+			 * something you do not have which may or may not
+			 * be a commit.
+			 */
 			if (!ref_newer(ref->peer_ref->new_sha1,
 				       ref->old_sha1)) {
 				error("remote ref '%s' is not a strict "
@@ -188,10 +238,6 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
 				continue;
 			}
 		}
-		if (!memcmp(ref->old_sha1, ref->peer_ref->new_sha1, 20)) {
-			fprintf(stderr, "'%s': up-to-date\n", ref->name);
-			continue;
-		}
 		memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20);
 		if (is_zero_sha1(ref->new_sha1)) {
 			error("cannot happen anymore");