mirror of
https://github.com/git/git.git
synced 2024-10-28 04:49:43 +01:00
refs: rename is_special_ref()
to is_pseudo_ref()
Rename `is_special_ref()` to `is_pseudo_ref()` to adapt to the newly defined terminology in our gitglossary(7). Note that in the preceding commit we have just renamed `is_pseudoref()` to `is_root_ref()`, where there may be confusion for in-flight patch series that add new calls to `is_pseudoref()`. In order to intentionally break such patch series we have thus picked `is_pseudo_ref()` instead of `is_pseudoref()` as the new name. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f6936e62a5
commit
32019a7a76
1 changed files with 10 additions and 10 deletions
20
refs.c
20
refs.c
|
@ -1872,13 +1872,13 @@ static int refs_read_special_head(struct ref_store *ref_store,
|
|||
return result;
|
||||
}
|
||||
|
||||
static int is_special_ref(const char *refname)
|
||||
static int is_pseudo_ref(const char *refname)
|
||||
{
|
||||
/*
|
||||
* Special references are refs that have different semantics compared
|
||||
* to "normal" refs. These refs can thus not be stored in the ref
|
||||
* backend, but must always be accessed via the filesystem. The
|
||||
* following refs are special:
|
||||
* Pseudorefs are refs that have different semantics compared to
|
||||
* "normal" refs. These refs can thus not be stored in the ref backend,
|
||||
* but must always be accessed via the filesystem. The following refs
|
||||
* are pseudorefs:
|
||||
*
|
||||
* - FETCH_HEAD may contain multiple object IDs, and each one of them
|
||||
* carries additional metadata like where it came from.
|
||||
|
@ -1887,17 +1887,17 @@ static int is_special_ref(const char *refname)
|
|||
* heads.
|
||||
*
|
||||
* Reading, writing or deleting references must consistently go either
|
||||
* through the filesystem (special refs) or through the reference
|
||||
* through the filesystem (pseudorefs) or through the reference
|
||||
* backend (normal ones).
|
||||
*/
|
||||
static const char * const special_refs[] = {
|
||||
static const char * const pseudo_refs[] = {
|
||||
"FETCH_HEAD",
|
||||
"MERGE_HEAD",
|
||||
};
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(special_refs); i++)
|
||||
if (!strcmp(refname, special_refs[i]))
|
||||
for (i = 0; i < ARRAY_SIZE(pseudo_refs); i++)
|
||||
if (!strcmp(refname, pseudo_refs[i]))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
|
@ -1908,7 +1908,7 @@ int refs_read_raw_ref(struct ref_store *ref_store, const char *refname,
|
|||
unsigned int *type, int *failure_errno)
|
||||
{
|
||||
assert(failure_errno);
|
||||
if (is_special_ref(refname))
|
||||
if (is_pseudo_ref(refname))
|
||||
return refs_read_special_head(ref_store, refname, oid, referent,
|
||||
type, failure_errno);
|
||||
|
||||
|
|
Loading…
Reference in a new issue