X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=send-pack.c;h=9f9a6e70b8789f63891c5b6e07822c546af8eec4;hb=5f93926c3c5c4fe1def39de82076bc69ec89c058;hp=0ab135c9881c4d9fa6b82ea80f5e62d2fbf17d28;hpb=b30245c8e92ecaf8fb877189d7620a5a9a205120;p=git.git

diff --git a/send-pack.c b/send-pack.c
index 0ab135c9..9f9a6e70 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -181,7 +181,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
 	int new_refs;
 
 	/* No funny business with the matcher */
-	remote_tail = get_remote_heads(in, &remote_refs, 0, NULL);
+	remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1);
 	get_local_heads();
 
 	/* match them up */
@@ -206,7 +206,8 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
 		/* This part determines what can overwrite what.
 		 * The rules are:
 		 *
-		 * (0) you can always use --force.
+		 * (0) you can always use --force or +A:B notation to
+		 *     selectively force individual ref pairs.
 		 *
 		 * (1) if the old thing does not exist, it is OK.
 		 *
@@ -218,16 +219,19 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
 		 *     descendant of old, it is OK.
 		 */
 
-		if (!force_update && !is_zero_sha1(ref->old_sha1)) {
+		if (!force_update &&
+		    !is_zero_sha1(ref->old_sha1) &&
+		    !ref->force) {
 			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
+			 * you _could_ have an 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,