diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-08 10:05:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-08 10:05:39 -0800 |
| commit | 84b7a6e7cfc1f99473a651fbcda28816e2d2e270 (patch) | |
| tree | 27e31552c31068ab67f8351e76fa3bf0a82dde39 /object.c | |
| parent | Merge branch 'jc/whitespace-incomplete-line' into jch (diff) | |
| parent | object: fix performance regression when peeling tags (diff) | |
| download | git-84b7a6e7cfc1f99473a651fbcda28816e2d2e270.tar.gz git-84b7a6e7cfc1f99473a651fbcda28816e2d2e270.zip | |
Merge branch 'ps/ref-peeled-tags-fixes' into jch
Another fix-up to "peeled-tags" topic.
* ps/ref-peeled-tags-fixes:
object: fix performance regression when peeling tags
Diffstat (limited to 'object.c')
| -rw-r--r-- | object.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -214,7 +214,7 @@ enum peel_status peel_object(struct repository *r, { struct object *o = lookup_unknown_object(r, name); - if (o->type == OBJ_NONE || flags & PEEL_OBJECT_VERIFY_OBJECT_TYPE) { + if (o->type == OBJ_NONE) { int type = odb_read_object_info(r->objects, name, NULL); if (type < 0 || !object_as_type(o, type, 0)) return PEEL_INVALID; @@ -228,7 +228,7 @@ enum peel_status peel_object(struct repository *r, if (o && o->type == OBJ_TAG && ((struct tag *)o)->tagged) { o = ((struct tag *)o)->tagged; - if (flags & PEEL_OBJECT_VERIFY_OBJECT_TYPE) { + if (flags & PEEL_OBJECT_VERIFY_TAGGED_OBJECT_TYPE) { int type = odb_read_object_info(r->objects, &o->oid, NULL); if (type < 0 || !object_as_type(o, type, 0)) return PEEL_INVALID; |