[PATCH v4 3/4] bisect: fix misuse of `refs_for_each_ref_in()`
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Feb 19, 2026, 07:57 UTC
- Message-ID
- <20260219-b4-pks-fix-for-each-ref-in-misuse-v4-3-57ac30172fae@pks.im>
- In-Reply-To
- <20260219-b4-pks-fix-for-each-ref-in-misuse-v4-0-57ac30172fae@pks.im>
All callers of `refs_for_each_ref_in()` pass in a string that is terminated with a trailing slash to indicate that they only want to see refs in that specific ref hierarchy. This is in fact a requirement if one wants to use this function, as the function trims the prefix from each yielded ref. So if there was a reference that was called "refs/bisect" as in our example, the result after trimming would be the empty string, and that's something we disallow.
Fix this by adding the trailing slash.
Furthermore, taking a closer look, we strip the prefix only to re-add it in `mark_for_removal()`. This is somewhat roundabout, as we can instead call `refs_for_each_fullref_in()` to not do any stripping at all. Do so to simplify the code a bit.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- bisect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bisect.c b/bisect.c index 326b59c0dc..4f0d1a1853 100644 --- a/bisect.c +++ b/bisect.c @@ -1180,7 +1180,7 @@ int estimate_bisect_steps(int all) static int mark_for_removal(const struct reference *ref, void *cb_data) { struct string_list *refs = cb_data; - char *bisect_ref = xstrfmt("refs/bisect%s", ref->name); + char *bisect_ref = xstrdup(ref->name); string_list_append(refs, bisect_ref); return 0; } @@ -1191,9 +1191,9 @@ int bisect_clean_state(void) /* There may be some refs packed during bisection */ struct string_list refs_for_removal = STRING_LIST_INIT_NODUP; - refs_for_each_ref_in(get_main_ref_store(the_repository), - "refs/bisect", mark_for_removal, - (void *) &refs_for_removal); + refs_for_each_fullref_in(get_main_ref_store(the_repository), + "refs/bisect/", NULL, mark_for_removal, + &refs_for_removal); string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD")); string_list_append(&refs_for_removal, xstrdup("BISECT_EXPECTED_REV")); result = refs_delete_refs(get_main_ref_store(the_repository),
-- 2.53.0.414.gf7e9f6c205.dirty