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

[PATCH] Dereference tag repeatedly until we get a non-tag.

Browse Source 
When we allow a tag object in place of a commit object, we only
dereferenced the given tag once, which causes a tag that points at a tag
that points at a commit to be rejected.  Instead, dereference tag
repeatedly until we get a non-tag.

This patch makes change to two functions:

 - commit.c::lookup_commit_reference() is used by merge-base,
   rev-tree and rev-parse to convert user supplied SHA1 to that of
   a commit.
 - rev-list uses its own get_commit_reference() to do the same.

Dereferencing tags this way helps both of these uses.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-07-10 23:55:56 -07:00
committed by Linus Torvalds
parent a3eb250f99
commit 013aab8265
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
commit.c
View File

@ -52,8 +52,9 @@ struct commit *lookup_commit_reference(const unsigned char *sha1)
if (!obj) if (!obj)
return NULL; return NULL;
if (obj->type == tag_type) while (obj->type == tag_type)
obj = ((struct tag *)obj)->tagged; obj = parse_object(((struct tag *)obj)->tagged->sha1);
return check_commit(obj, sha1); return check_commit(obj, sha1);
} }

4
rev-list.c
View File

@ -367,12 +367,12 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
/* /*
* Tag object? Look what it points to.. * Tag object? Look what it points to..
*/ */
if (object->type == tag_type) { while (object->type == tag_type) {
struct tag *tag = (struct tag *) object; struct tag *tag = (struct tag *) object;
object->flags |= flags; object->flags |= flags;
if (tag_objects && !(object->flags & UNINTERESTING)) if (tag_objects && !(object->flags & UNINTERESTING))
add_pending_object(object, tag->tag); add_pending_object(object, tag->tag);
object = tag->tagged; object = parse_object(tag->tagged->sha1);
} }
/* /*