Avoid scary errors about tagged trees/blobs during git-fetch

spearce · spearce · commit cfa5b2b7faa1 · 2007-10-19T03:47:07.000-04:00
This is the same bug as 42a3217. The warning "Object $X is a tree, not a commit" is bogus and is not relevant here. If its not a commit we just need to make sure we don't mark it for merge as we fill out FETCH_HEAD. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
diff --git a/builtin-fetch.c b/builtin-fetch.c
@@ -202,8 +202,8 @@ static int update_local_ref(struct ref *ref,
 		return s_update_ref("updating tag", ref, 0);
 	}
 
-	current = lookup_commit_reference(ref->old_sha1);
-	updated = lookup_commit_reference(ref->new_sha1);
+	current = lookup_commit_reference_gently(ref->old_sha1, 1);
+	updated = lookup_commit_reference_gently(ref->new_sha1, 1);
 	if (!current || !updated) {
 		char *msg;
 		if (!strncmp(ref->name, "refs/tags/", 10))
@@ -261,7 +261,7 @@ static void store_updated_refs(const char *url, struct ref *ref_map)
 			ref->force = rm->peer_ref->force;
 		}
 
-		commit = lookup_commit_reference(rm->old_sha1);
+		commit = lookup_commit_reference_gently(rm->old_sha1, 1);
 		if (!commit)
 			rm->merge = 0;
 
