diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-23 09:14:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-23 09:14:32 -0700 |
| commit | 0ff6d23a0f214ea19b2b26a6ab81fb02fefbea6d (patch) | |
| tree | d32ccf7db553b2d8d828a961de9d1acc9f06ca00 /refs | |
| parent | e55f364398be3cfae6243ada1a6a8bb66ea7cc46 (diff) | |
| parent | 8e4f5c2dc26e8e88c8c4784f133d2b35a771d2ac (diff) | |
| download | git-0ff6d23a0f214ea19b2b26a6ab81fb02fefbea6d.tar.xz | |
Merge branch 'ps/pseudo-ref-terminology' into ps/ref-storage-migration
* ps/pseudo-ref-terminology:
refs: refuse to write pseudorefs
ref-filter: properly distinuish pseudo and root refs
refs: pseudorefs are no refs
refs: classify HEAD as a root ref
refs: do not check ref existence in `is_root_ref()`
refs: rename `is_special_ref()` to `is_pseudo_ref()`
refs: rename `is_pseudoref()` to `is_root_ref()`
Documentation/glossary: define root refs as refs
Documentation/glossary: clarify limitations of pseudorefs
Documentation/glossary: redefine pseudorefs as special refs
Diffstat (limited to 'refs')
| -rw-r--r-- | refs/files-backend.c | 3 | ||||
| -rw-r--r-- | refs/reftable-backend.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index f09aef457b..73380d7e99 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -359,8 +359,7 @@ static void add_pseudoref_and_head_entries(struct ref_store *ref_store, strbuf_addstr(&refname, de->d_name); dtype = get_dtype(de, &path, 1); - if (dtype == DT_REG && (is_pseudoref(ref_store, de->d_name) || - is_headref(ref_store, de->d_name))) + if (dtype == DT_REG && is_root_ref(de->d_name)) loose_fill_ref_dir_regular_file(refs, refname.buf, dir); strbuf_setlen(&refname, dirnamelen); diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index 38faeac4e5..f6edfdf5b3 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -375,8 +375,7 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator) */ if (!starts_with(iter->ref.refname, "refs/") && !(iter->flags & DO_FOR_EACH_INCLUDE_ROOT_REFS && - (is_pseudoref(&iter->refs->base, iter->ref.refname) || - is_headref(&iter->refs->base, iter->ref.refname)))) { + is_root_ref(iter->ref.refname))) { continue; } |