mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This is the same bug as 42a32174b6.
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>
This commit is contained in:
Shawn O. Pearce
2007-10-19 00:54:59 -04:00
parent da0204df58
commit cfa5b2b7fa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-fetch.c
View File

@ -202,8 +202,8 @@ static int update_local_ref(struct ref *ref,
return s_update_ref("updating tag", ref, 0); return s_update_ref("updating tag", ref, 0);
} }
current = lookup_commit_reference(ref->old_sha1); current = lookup_commit_reference_gently(ref->old_sha1, 1);
updated = lookup_commit_reference(ref->new_sha1); updated = lookup_commit_reference_gently(ref->new_sha1, 1);
if (!current || !updated) { if (!current || !updated) {
char *msg; char *msg;
if (!strncmp(ref->name, "refs/tags/", 10)) 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; ref->force = rm->peer_ref->force;
} }
commit = lookup_commit_reference(rm->old_sha1); commit = lookup_commit_reference_gently(rm->old_sha1, 1);
if (!commit) if (!commit)
rm->merge = 0; rm->merge = 0;