diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-10-18 16:24:47 -0700 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 20:37:52 -0400 |
commit | 42a32174b600f139b489341b1281fb1bfa14c252 (patch) | |
tree | 4f9ac0f592bb3d79b93cb3f8b66442d6b9b7d460 /builtin-fetch--tool.c | |
parent | 1aa3d01f870a68dc46a872c83f9cd051f172f9b3 (diff) | |
download | git-42a32174b600f139b489341b1281fb1bfa14c252.tar.gz git-42a32174b600f139b489341b1281fb1bfa14c252.tar.xz |
Avoid scary errors about tagged trees/blobs during git-fetch
Ok, what is going on is:
- append_fetch_head() looks up the SHA1 for all heads (including tags):
if (get_sha1(head, sha1))
return error("Not a valid object name: %s", head);
- it then wants to check if it's a candidate for merging (because
fetching also does the whole "list which heads to merge" in case
it is going to be part of a "pull"):
commit = lookup_commit_reference(sha1);
if (!commit)
not_for_merge = 1;
- and that "lookup_commit_reference()" is just very vocal about the
case where it fails. It really shouldn't be, and it shouldn't
affect the actual end result, but that basically explains why
you get that scary warning.
In short, the warning is just bogus, and should be harmless, but
I agree that it's ugly. I think the appended patch should fix it.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'builtin-fetch--tool.c')
-rw-r--r-- | builtin-fetch--tool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c index e2f8ede9a..db133348a 100644 --- a/builtin-fetch--tool.c +++ b/builtin-fetch--tool.c @@ -148,7 +148,7 @@ static int append_fetch_head(FILE *fp, if (get_sha1(head, sha1)) return error("Not a valid object name: %s", head); - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference_gently(sha1, 1); if (!commit) not_for_merge = 1; |