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 /ref-filter.h | |
| 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 'ref-filter.h')
| -rw-r--r-- | ref-filter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ref-filter.h b/ref-filter.h index 0ca28d2bba..27ae1aa0d1 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -23,9 +23,9 @@ FILTER_REFS_REMOTES | FILTER_REFS_OTHERS) #define FILTER_REFS_DETACHED_HEAD 0x0020 #define FILTER_REFS_PSEUDOREFS 0x0040 -#define FILTER_REFS_ROOT_REFS (FILTER_REFS_DETACHED_HEAD | FILTER_REFS_PSEUDOREFS) +#define FILTER_REFS_ROOT_REFS 0x0080 #define FILTER_REFS_KIND_MASK (FILTER_REFS_REGULAR | FILTER_REFS_DETACHED_HEAD | \ - FILTER_REFS_PSEUDOREFS) + FILTER_REFS_PSEUDOREFS | FILTER_REFS_ROOT_REFS) struct atom_value; struct ref_sorting; |