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

Merge branch 'jk/nested-points-at'

Browse Source 
"git tag --list --points-at X" showed tags that directly refers to
object X, but did not list a tag that points at such a tag, which
has been corrected.

* jk/nested-points-at:
  ref-filter: simplify return type of match_points_at
  ref-filter: avoid parsing non-tags in match_points_at()
  ref-filter: avoid parsing tagged objects in match_points_at()
  ref-filter: handle nested tags in --points-at option
This commit is contained in:
Junio C Hamano
2023-07-25 12:05:24 -07:00
parent 02f50d0d19 d9e0062159
commit 5929e66755
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ref-filter.c
View File

@ -2344,32 +2344,40 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,
/* /*
* Given a ref (oid, refname), check if the ref belongs to the array * Given a ref (oid, refname), check if the ref belongs to the array
* of oids. If the given ref is a tag, check if the given tag points * of oids. If the given ref is a tag, check if the given tag points
* at one of the oids in the given oid array. * at one of the oids in the given oid array. Returns non-zero if a
* match is found.
*
* NEEDSWORK: * NEEDSWORK:
* 1. Only a single level of indirection is obtained, we might want to * As the refs are cached we might know what refname peels to without
* change this to account for multiple levels (e.g. annotated tags
* pointing to annotated tags pointing to a commit.)
* 2. As the refs are cached we might know what refname peels to without
* the need to parse the object via parse_object(). peel_ref() might be a * the need to parse the object via parse_object(). peel_ref() might be a
* more efficient alternative to obtain the pointee. * more efficient alternative to obtain the pointee.
*/ */
static const struct object_id *match_points_at(struct oid_array *points_at, static int match_points_at(struct oid_array *points_at,
const struct object_id *oid, const struct object_id *oid,
const char *refname) const char *refname)
{ {
const struct object_id *tagged_oid = NULL;
struct object *obj; struct object *obj;
if (oid_array_lookup(points_at, oid) >= 0) if (oid_array_lookup(points_at, oid) >= 0)
return oid; return 1;
obj = parse_object(the_repository, oid); obj = parse_object_with_flags(the_repository, oid,
PARSE_OBJECT_SKIP_HASH_CHECK);
while (obj && obj->type == OBJ_TAG) {
struct tag *tag = (struct tag *)obj;
if (parse_tag(tag) < 0) {
obj = NULL;
break;
}
if (oid_array_lookup(points_at, get_tagged_oid(tag)) >= 0)
return 1;
obj = tag->tagged;
}
if (!obj) if (!obj)
die(_("malformed object at '%s'"), refname); die(_("malformed object at '%s'"), refname);
if (obj->type == OBJ_TAG) return 0;
tagged_oid = get_tagged_oid((struct tag *)obj);
if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0)
return tagged_oid;
return NULL;
} }
/* /*

2
t/t6302-for-each-ref-filter.sh
View File

@ -45,6 +45,8 @@ test_expect_success 'check signed tags with --points-at' '
sed -e "s/Z$//" >expect <<-\EOF && sed -e "s/Z$//" >expect <<-\EOF &&
refs/heads/side Z refs/heads/side Z
refs/tags/annotated-tag four refs/tags/annotated-tag four
refs/tags/doubly-annotated-tag An annotated tag
refs/tags/doubly-signed-tag A signed tag
refs/tags/four Z refs/tags/four Z
refs/tags/signed-tag four refs/tags/signed-tag four
EOF EOF