summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/branch.c2
-rw-r--r--src/refdb_fs.c24
-rw-r--r--src/refs.c76
-rw-r--r--src/refs.h6
-rw-r--r--src/refspec.c5
-rw-r--r--src/remote.c8
-rw-r--r--src/repository.c14
-rw-r--r--src/transaction.c20
-rw-r--r--src/transports/local.c4
-rw-r--r--src/transports/smart_protocol.c2
10 files changed, 81 insertions, 80 deletions
diff --git a/src/branch.c b/src/branch.c
index e72d470bb..c5d915247 100644
--- a/src/branch.c
+++ b/src/branch.c
@@ -141,7 +141,7 @@ static int branch_equals(git_repository *repo, const char *path, void *payload)
int equal = 0;
if (git_reference__read_head(&head, repo, path) < 0 ||
- git_reference_type(head) != GIT_REF_SYMBOLIC)
+ git_reference_type(head) != GIT_REFERENCE_SYMBOLIC)
goto done;
equal = !git__strcmp(head->target.symbolic, branch->name);
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index 1eebf5174..361451b7d 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -811,12 +811,12 @@ static int loose_commit(git_filebuf *file, const git_reference *ref)
{
assert(file && ref);
- if (ref->type == GIT_REF_OID) {
+ if (ref->type == GIT_REFERENCE_DIRECT) {
char oid[GIT_OID_HEXSZ + 1];
git_oid_nfmt(oid, sizeof(oid), &ref->target.oid);
git_filebuf_printf(file, "%s\n", oid);
- } else if (ref->type == GIT_REF_SYMBOLIC) {
+ } else if (ref->type == GIT_REFERENCE_SYMBOLIC) {
git_filebuf_printf(file, GIT_SYMREF "%s\n", ref->target.symbolic);
} else {
assert(0); /* don't let this happen */
@@ -1142,19 +1142,19 @@ static int cmp_old_ref(int *cmp, git_refdb_backend *backend, const char *name,
goto out;
/* If the types don't match, there's no way the values do */
- if (old_id && old_ref->type != GIT_REF_OID) {
+ if (old_id && old_ref->type != GIT_REFERENCE_DIRECT) {
*cmp = -1;
goto out;
}
- if (old_target && old_ref->type != GIT_REF_SYMBOLIC) {
+ if (old_target && old_ref->type != GIT_REFERENCE_SYMBOLIC) {
*cmp = 1;
goto out;
}
- if (old_id && old_ref->type == GIT_REF_OID)
+ if (old_id && old_ref->type == GIT_REFERENCE_DIRECT)
*cmp = git_oid_cmp(old_id, &old_ref->target.oid);
- if (old_target && old_ref->type == GIT_REF_SYMBOLIC)
+ if (old_target && old_ref->type == GIT_REFERENCE_SYMBOLIC)
*cmp = git__strcmp(old_target, old_ref->target.symbolic);
out:
@@ -1184,7 +1184,7 @@ static int maybe_append_head(refdb_fs_backend *backend, const git_reference *ref
git_reference *tmp = NULL, *head = NULL, *peeled = NULL;
const char *name;
- if (ref->type == GIT_REF_SYMBOLIC)
+ if (ref->type == GIT_REFERENCE_SYMBOLIC)
return 0;
/* if we can't resolve, we use {0}*40 as old id */
@@ -1194,14 +1194,14 @@ static int maybe_append_head(refdb_fs_backend *backend, const git_reference *ref
if ((error = git_reference_lookup(&head, backend->repo, GIT_HEAD_FILE)) < 0)
return error;
- if (git_reference_type(head) == GIT_REF_OID)
+ if (git_reference_type(head) == GIT_REFERENCE_DIRECT)
goto cleanup;
if ((error = git_reference_lookup(&tmp, backend->repo, GIT_HEAD_FILE)) < 0)
goto cleanup;
/* Go down the symref chain until we find the branch */
- while (git_reference_type(tmp) == GIT_REF_SYMBOLIC) {
+ while (git_reference_type(tmp) == GIT_REFERENCE_SYMBOLIC) {
error = git_reference_lookup(&peeled, backend->repo, git_reference_symbolic_target(tmp));
if (error < 0)
break;
@@ -1279,7 +1279,7 @@ static int refdb_fs_backend__write_tail(
goto on_error;
}
- if (ref->type == GIT_REF_SYMBOLIC)
+ if (ref->type == GIT_REFERENCE_SYMBOLIC)
new_target = ref->target.symbolic;
else
new_id = &ref->target.oid;
@@ -1886,7 +1886,7 @@ static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, co
git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT;
git_repository *repo = backend->repo;
- is_symbolic = ref->type == GIT_REF_SYMBOLIC;
+ is_symbolic = ref->type == GIT_REFERENCE_SYMBOLIC;
/* "normal" symbolic updates do not write */
if (is_symbolic &&
@@ -1979,7 +1979,7 @@ static int refdb_reflog_fs__rename(git_refdb_backend *_backend, const char *old_
repo = backend->repo;
if ((error = git_reference__normalize_name(
- &normalized, new_name, GIT_REF_FORMAT_ALLOW_ONELEVEL)) < 0)
+ &normalized, new_name, GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL)) < 0)
return error;
if (git_buf_joinpath(&temp_path, repo->gitdir, GIT_REFLOG_DIR) < 0)
diff --git a/src/refs.c b/src/refs.c
index 85599da6e..6e919b2fc 100644
--- a/src/refs.c
+++ b/src/refs.c
@@ -59,7 +59,7 @@ git_reference *git_reference__alloc_symbolic(
if (!ref)
return NULL;
- ref->type = GIT_REF_SYMBOLIC;
+ ref->type = GIT_REFERENCE_SYMBOLIC;
if ((ref->target.symbolic = git__strdup(target)) == NULL) {
git__free(ref);
@@ -82,7 +82,7 @@ git_reference *git_reference__alloc(
if (!ref)
return NULL;
- ref->type = GIT_REF_OID;
+ ref->type = GIT_REFERENCE_DIRECT;
git_oid_cpy(&ref->target.oid, oid);
if (peel != NULL)
@@ -108,7 +108,7 @@ git_reference *git_reference__set_name(
int git_reference_dup(git_reference **dest, git_reference *source)
{
- if (source->type == GIT_REF_SYMBOLIC)
+ if (source->type == GIT_REFERENCE_SYMBOLIC)
*dest = git_reference__alloc_symbolic(source->name, source->target.symbolic);
else
*dest = git_reference__alloc(source->name, &source->target.oid, &source->peel);
@@ -126,7 +126,7 @@ void git_reference_free(git_reference *reference)
if (reference == NULL)
return;
- if (reference->type == GIT_REF_SYMBOLIC)
+ if (reference->type == GIT_REFERENCE_SYMBOLIC)
git__free(reference->target.symbolic);
if (reference->db)
@@ -140,7 +140,7 @@ int git_reference_delete(git_reference *ref)
const git_oid *old_id = NULL;
const char *old_target = NULL;
- if (ref->type == GIT_REF_OID)
+ if (ref->type == GIT_REFERENCE_DIRECT)
old_id = &ref->target.oid;
else
old_target = ref->target.symbolic;
@@ -186,14 +186,14 @@ static int reference_normalize_for_repo(
bool validate)
{
int precompose;
- unsigned int flags = GIT_REF_FORMAT_ALLOW_ONELEVEL;
+ unsigned int flags = GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL;
if (!git_repository__cvar(&precompose, repo, GIT_CVAR_PRECOMPOSE) &&
precompose)
- flags |= GIT_REF_FORMAT__PRECOMPOSE_UNICODE;
+ flags |= GIT_REFERENCE_FORMAT__PRECOMPOSE_UNICODE;
if (!validate)
- flags |= GIT_REF_FORMAT__VALIDATION_DISABLE;
+ flags |= GIT_REFERENCE_FORMAT__VALIDATION_DISABLE;
return git_reference_normalize_name(out, GIT_REFNAME_MAX, name, flags);
}
@@ -205,7 +205,7 @@ int git_reference_lookup_resolved(
int max_nesting)
{
git_refname_t scan_name;
- git_ref_t scan_type;
+ git_reference_t scan_type;
int error = 0, nesting;
git_reference *ref = NULL;
git_refdb *refdb;
@@ -219,7 +219,7 @@ int git_reference_lookup_resolved(
else if (max_nesting < 0)
max_nesting = DEFAULT_NESTING_LEVEL;
- scan_type = GIT_REF_SYMBOLIC;
+ scan_type = GIT_REFERENCE_SYMBOLIC;
if ((error = reference_normalize_for_repo(scan_name, repo, name, true)) < 0)
return error;
@@ -228,7 +228,7 @@ int git_reference_lookup_resolved(
return error;
for (nesting = max_nesting;
- nesting >= 0 && scan_type == GIT_REF_SYMBOLIC;
+ nesting >= 0 && scan_type == GIT_REFERENCE_SYMBOLIC;
nesting--)
{
if (nesting != max_nesting) {
@@ -242,7 +242,7 @@ int git_reference_lookup_resolved(
scan_type = ref->type;
}
- if (scan_type != GIT_REF_OID && max_nesting != 0) {
+ if (scan_type != GIT_REFERENCE_DIRECT && max_nesting != 0) {
giterr_set(GITERR_REFERENCE,
"cannot resolve reference (>%u levels deep)", max_nesting);
git_reference_free(ref);
@@ -354,7 +354,7 @@ cleanup:
/**
* Getters
*/
-git_ref_t git_reference_type(const git_reference *ref)
+git_reference_t git_reference_type(const git_reference *ref)
{
assert(ref);
return ref->type;
@@ -376,7 +376,7 @@ const git_oid *git_reference_target(const git_reference *ref)
{
assert(ref);
- if (ref->type != GIT_REF_OID)
+ if (ref->type != GIT_REFERENCE_DIRECT)
return NULL;
return &ref->target.oid;
@@ -386,7 +386,7 @@ const git_oid *git_reference_target_peel(const git_reference *ref)
{
assert(ref);
- if (ref->type != GIT_REF_OID || git_oid_iszero(&ref->peel))
+ if (ref->type != GIT_REFERENCE_DIRECT || git_oid_iszero(&ref->peel))
return NULL;
return &ref->peel;
@@ -396,7 +396,7 @@ const char *git_reference_symbolic_target(const git_reference *ref)
{
assert(ref);
- if (ref->type != GIT_REF_SYMBOLIC)
+ if (ref->type != GIT_REFERENCE_SYMBOLIC)
return NULL;
return ref->target.symbolic;
@@ -566,7 +566,7 @@ int git_reference_symbolic_create(
static int ensure_is_an_updatable_direct_reference(git_reference *ref)
{
- if (ref->type == GIT_REF_OID)
+ if (ref->type == GIT_REFERENCE_DIRECT)
return 0;
giterr_set(GITERR_REFERENCE, "cannot set OID on symbolic reference");
@@ -594,7 +594,7 @@ int git_reference_set_target(
static int ensure_is_an_updatable_symbolic_reference(git_reference *ref)
{
- if (ref->type == GIT_REF_SYMBOLIC)
+ if (ref->type == GIT_REFERENCE_SYMBOLIC)
return 0;
giterr_set(GITERR_REFERENCE, "cannot set symbolic target on a direct reference");
@@ -640,7 +640,7 @@ static int update_wt_heads(git_repository *repo, const char *path, void *payload
goto out;
}
- if (git_reference_type(head) != GIT_REF_SYMBOLIC ||
+ if (git_reference_type(head) != GIT_REFERENCE_SYMBOLIC ||
git__strcmp(head->target.symbolic, data->old_name) != 0) {
error = 0;
goto out;
@@ -723,10 +723,10 @@ int git_reference_rename(
int git_reference_resolve(git_reference **ref_out, const git_reference *ref)
{
switch (git_reference_type(ref)) {
- case GIT_REF_OID:
+ case GIT_REFERENCE_DIRECT:
return git_reference_lookup(ref_out, ref->db->repo, ref->name);
- case GIT_REF_SYMBOLIC:
+ case GIT_REFERENCE_SYMBOLIC:
return git_reference_lookup_resolved(ref_out, ref->db->repo, ref->target.symbolic, -1);
default:
@@ -970,7 +970,7 @@ int git_reference__normalize_name(
int segment_len, segments_count = 0, error = GIT_EINVALIDSPEC;
unsigned int process_flags;
bool normalize = (buf != NULL);
- bool validate = (flags & GIT_REF_FORMAT__VALIDATION_DISABLE) == 0;
+ bool validate = (flags & GIT_REFERENCE_FORMAT__VALIDATION_DISABLE) == 0;
#ifdef GIT_USE_ICONV
git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
@@ -988,7 +988,7 @@ int git_reference__normalize_name(
git_buf_clear(buf);
#ifdef GIT_USE_ICONV
- if ((flags & GIT_REF_FORMAT__PRECOMPOSE_UNICODE) != 0) {
+ if ((flags & GIT_REFERENCE_FORMAT__PRECOMPOSE_UNICODE) != 0) {
size_t namelen = strlen(current);
if ((error = git_path_iconv_init_precompose(&ic)) < 0 ||
(error = git_path_iconv(&ic, &current, &namelen)) < 0)
@@ -1007,11 +1007,11 @@ int git_reference__normalize_name(
while (true) {
segment_len = ensure_segment_validity(current);
if (segment_len < 0) {
- if ((process_flags & GIT_REF_FORMAT_REFSPEC_PATTERN) &&
+ if ((process_flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN) &&
current[0] == '*' &&
(current[1] == '\0' || current[1] == '/')) {
/* Accept one wildcard as a full refname component. */
- process_flags &= ~GIT_REF_FORMAT_REFSPEC_PATTERN;
+ process_flags &= ~GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
segment_len = 1;
} else
goto cleanup;
@@ -1056,13 +1056,13 @@ int git_reference__normalize_name(
if (current[segment_len - 1] == '/')
goto cleanup;
- if ((segments_count == 1 ) && !(flags & GIT_REF_FORMAT_ALLOW_ONELEVEL))
+ if ((segments_count == 1 ) && !(flags & GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL))
goto cleanup;
if ((segments_count == 1 ) &&
- !(flags & GIT_REF_FORMAT_REFSPEC_SHORTHAND) &&
+ !(flags & GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND) &&
!(is_all_caps_and_underscore(name, (size_t)segment_len) ||
- ((flags & GIT_REF_FORMAT_REFSPEC_PATTERN) && !strcmp("*", name))))
+ ((flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN) && !strcmp("*", name))))
goto cleanup;
if ((segments_count > 1)
@@ -1116,13 +1116,13 @@ cleanup:
return error;
}
-#define GIT_REF_TYPEMASK (GIT_REF_OID | GIT_REF_SYMBOLIC)
+#define GIT_REFERENCE_TYPEMASK (GIT_REFERENCE_DIRECT | GIT_REFERENCE_SYMBOLIC)
int git_reference_cmp(
const git_reference *ref1,
const git_reference *ref2)
{
- git_ref_t type1, type2;
+ git_reference_t type1, type2;
assert(ref1 && ref2);
type1 = git_reference_type(ref1);
@@ -1130,9 +1130,9 @@ int git_reference_cmp(
/* let's put symbolic refs before OIDs */
if (type1 != type2)
- return (type1 == GIT_REF_SYMBOLIC) ? -1 : 1;
+ return (type1 == GIT_REFERENCE_SYMBOLIC) ? -1 : 1;
- if (type1 == GIT_REF_SYMBOLIC)
+ if (type1 == GIT_REFERENCE_SYMBOLIC)
return strcmp(ref1->target.symbolic, ref2->target.symbolic);
return git_oid__cmp(&ref1->target.oid, &ref2->target.oid);
@@ -1158,7 +1158,7 @@ static int get_terminal(git_reference **out, git_repository *repo, const char *r
return error;
}
- if (git_reference_type(ref) == GIT_REF_OID) {
+ if (git_reference_type(ref) == GIT_REFERENCE_DIRECT) {
*out = ref;
error = 0;
} else {
@@ -1197,7 +1197,7 @@ int git_reference__update_terminal(
/* found a dangling symref */
if (error == GIT_ENOTFOUND && ref) {
- assert(git_reference_type(ref) == GIT_REF_SYMBOLIC);
+ assert(git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC);
giterr_clear();
error = reference__create(&ref2, repo, ref->target.symbolic, oid, NULL, 0, to_use,
log_message, NULL, NULL);
@@ -1206,7 +1206,7 @@ int git_reference__update_terminal(
error = reference__create(&ref2, repo, ref_name, oid, NULL, 0, to_use,
log_message, NULL, NULL);
} else if (error == 0) {
- assert(git_reference_type(ref) == GIT_REF_OID);
+ assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT);
error = reference__create(&ref2, repo, ref->name, oid, NULL, 1, to_use,
log_message, &ref->target.oid, NULL);
}
@@ -1359,7 +1359,7 @@ int git_reference_peel(
assert(ref);
- if (ref->type == GIT_REF_OID) {
+ if (ref->type == GIT_REFERENCE_DIRECT) {
resolved = ref;
} else {
if ((error = git_reference_resolve(&allocated, ref)) < 0)
@@ -1411,7 +1411,7 @@ int git_reference__is_valid_name(const char *refname, unsigned int flags)
int git_reference_is_valid_name(const char *refname)
{
- return git_reference__is_valid_name(refname, GIT_REF_FORMAT_ALLOW_ONELEVEL);
+ return git_reference__is_valid_name(refname, GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL);
}
const char *git_reference__shorthand(const char *name)
@@ -1440,7 +1440,7 @@ int git_reference__is_unborn_head(bool *unborn, const git_reference *ref, git_re
git_reference *tmp_ref;
assert(unborn && ref && repo);
- if (ref->type == GIT_REF_OID) {
+ if (ref->type == GIT_REFERENCE_DIRECT) {
*unborn = 0;
return 0;
}
diff --git a/src/refs.h b/src/refs.h
index f4f934222..46df95eba 100644
--- a/src/refs.h
+++ b/src/refs.h
@@ -55,8 +55,8 @@ extern bool git_reference__enable_symbolic_ref_target_validation;
#define GIT_STASH_FILE "stash"
#define GIT_REFS_STASH_FILE GIT_REFS_DIR GIT_STASH_FILE
-#define GIT_REF_FORMAT__PRECOMPOSE_UNICODE (1u << 16)
-#define GIT_REF_FORMAT__VALIDATION_DISABLE (1u << 15)
+#define GIT_REFERENCE_FORMAT__PRECOMPOSE_UNICODE (1u << 16)
+#define GIT_REFERENCE_FORMAT__VALIDATION_DISABLE (1u << 15)
#define GIT_REFNAME_MAX 1024
@@ -64,7 +64,7 @@ typedef char git_refname_t[GIT_REFNAME_MAX];
struct git_reference {
git_refdb *db;
- git_ref_t type;
+ git_reference_t type;
union {
git_oid oid;
diff --git a/src/refspec.c b/src/refspec.c
index f429776fb..7e68071d9 100644
--- a/src/refspec.c
+++ b/src/refspec.c
@@ -69,8 +69,9 @@ int git_refspec__parse(git_refspec *refspec, const char *input, bool is_fetch)
refspec->pattern = is_glob;
refspec->src = git__strndup(lhs, llen);
- flags = GIT_REF_FORMAT_ALLOW_ONELEVEL | GIT_REF_FORMAT_REFSPEC_SHORTHAND
- | (is_glob ? GIT_REF_FORMAT_REFSPEC_PATTERN : 0);
+ flags = GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL |
+ GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND |
+ (is_glob ? GIT_REFERENCE_FORMAT_REFSPEC_PATTERN : 0);
if (is_fetch) {
/*
diff --git a/src/remote.c b/src/remote.c
index 393068b31..2cfb921ba 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -1126,7 +1126,7 @@ static int remote_head_for_ref(git_remote_head **out, git_remote *remote, git_re
error = git_reference_resolve(&resolved_ref, ref);
/* If we're in an unborn branch, let's pretend nothing happened */
- if (error == GIT_ENOTFOUND && git_reference_type(ref) == GIT_REF_SYMBOLIC) {
+ if (error == GIT_ENOTFOUND && git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
ref_name = git_reference_symbolic_target(ref);
error = 0;
} else {
@@ -1329,7 +1329,7 @@ int git_remote_prune(git_remote *remote, const git_remote_callbacks *callbacks)
if (error < 0)
goto cleanup;
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC) {
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
git_reference_free(ref);
continue;
}
@@ -1450,7 +1450,7 @@ static int update_tips_for_spec(
continue;
/* In autotag mode, don't overwrite any locally-existing tags */
- error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag,
+ error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag,
log_message);
if (error == GIT_EEXISTS)
@@ -1919,7 +1919,7 @@ static int rename_one_remote_reference(
git_buf_cstr(&log_message))) < 0)
goto cleanup;
- if (git_reference_type(ref) != GIT_REF_SYMBOLIC)
+ if (git_reference_type(ref) != GIT_REFERENCE_SYMBOLIC)
goto cleanup;
/* Handle refs like origin/HEAD -> origin/master */
diff --git a/src/repository.c b/src/repository.c
index c6f7c2025..21e44351f 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -2119,7 +2119,7 @@ int git_repository_head_detached(git_repository *repo)
if (git_reference_lookup(&ref, repo, GIT_HEAD_FILE) < 0)
return -1;
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC) {
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
git_reference_free(ref);
return 0;
}
@@ -2146,7 +2146,7 @@ int git_repository_head_detached_for_worktree(git_repository *repo, const char *
if ((error = git_repository_head_for_worktree(&ref, repo, name)) < 0)
goto out;
- error = (git_reference_type(ref) != GIT_REF_SYMBOLIC);
+ error = (git_reference_type(ref) != GIT_REFERENCE_SYMBOLIC);
out:
git_reference_free(ref);
@@ -2163,7 +2163,7 @@ int git_repository_head(git_reference **head_out, git_repository *repo)
if ((error = git_reference_lookup(&head, repo, GIT_HEAD_FILE)) < 0)
return error;
- if (git_reference_type(head) == GIT_REF_OID) {
+ if (git_reference_type(head) == GIT_REFERENCE_DIRECT) {
*head_out = head;
return 0;
}
@@ -2188,7 +2188,7 @@ int git_repository_head_for_worktree(git_reference **out, git_repository *repo,
(error = git_reference__read_head(&head, repo, path.ptr)) < 0)
goto out;
- if (git_reference_type(head) != GIT_REF_OID) {
+ if (git_reference_type(head) != GIT_REFERENCE_DIRECT) {
git_reference *resolved;
error = git_reference_lookup_resolved(&resolved, repo, git_reference_symbolic_target(head), -1);
@@ -2286,7 +2286,7 @@ int git_repository_is_empty(git_repository *repo)
if (git_reference_lookup(&head, repo, GIT_HEAD_FILE) < 0)
return -1;
- if (git_reference_type(head) == GIT_REF_SYMBOLIC)
+ if (git_reference_type(head) == GIT_REFERENCE_SYMBOLIC)
is_empty =
(strcmp(git_reference_symbolic_target(head),
GIT_REFS_HEADS_DIR "master") == 0) &&
@@ -2594,7 +2594,7 @@ static int checkout_message(git_buf *out, git_reference *old, const char *new)
{
git_buf_puts(out, "checkout: moving from ");
- if (git_reference_type(old) == GIT_REF_SYMBOLIC)
+ if (git_reference_type(old) == GIT_REFERENCE_SYMBOLIC)
git_buf_puts(out, git_reference__shorthand(git_reference_symbolic_target(old)));
else
git_buf_puts(out, git_oid_tostr_s(git_reference_target(old)));
@@ -2669,7 +2669,7 @@ int git_repository_set_head(
if (error < 0 && error != GIT_ENOTFOUND)
goto cleanup;
- if (ref && current->type == GIT_REF_SYMBOLIC && git__strcmp(current->target.symbolic, ref->name) &&
+ if (ref && current->type == GIT_REFERENCE_SYMBOLIC && git__strcmp(current->target.symbolic, ref->name) &&
git_reference_is_branch(ref) && git_branch_is_checked_out(ref)) {
giterr_set(GITERR_REPOSITORY, "cannot set HEAD to reference '%s' as it is the current HEAD "
"of a linked repository.", git_reference_name(ref));
diff --git a/src/transaction.c b/src/transaction.c
index 22ba6b1b2..cc6d2b7c0 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -30,7 +30,7 @@ typedef struct {
const char *name;
void *payload;
- git_ref_t ref_type;
+ git_reference_t ref_type;
union {
git_oid id;
char *symbolic;
@@ -120,7 +120,7 @@ int git_transaction_lock_ref(git_transaction *tx, const char *refname)
return error;
git_strmap_insert(tx->locks, node->name, node, &error);
- if (error < 0)
+ if (error < 0)
goto cleanup;
return 0;
@@ -189,7 +189,7 @@ int git_transaction_set_target(git_transaction *tx, const char *refname, const g
return error;
git_oid_cpy(&node->target.id, target);
- node->ref_type = GIT_REF_OID;
+ node->ref_type = GIT_REFERENCE_DIRECT;
return 0;
}
@@ -209,7 +209,7 @@ int git_transaction_set_symbolic_target(git_transaction *tx, const char *refname
node->target.symbolic = git_pool_strdup(&tx->pool, target);
GITERR_CHECK_ALLOC(node->target.symbolic);
- node->ref_type = GIT_REF_SYMBOLIC;
+ node->ref_type = GIT_REFERENCE_SYMBOLIC;
return 0;
}
@@ -223,7 +223,7 @@ int git_transaction_remove(git_transaction *tx, const char *refname)
return error;
node->remove = true;
- node->ref_type = GIT_REF_OID; /* the id will be ignored */
+ node->ref_type = GIT_REFERENCE_DIRECT; /* the id will be ignored */
return 0;
}
@@ -292,9 +292,9 @@ static int update_target(git_refdb *db, transaction_node *node)
git_reference *ref;
int error, update_reflog;
- if (node->ref_type == GIT_REF_OID) {
+ if (node->ref_type == GIT_REFERENCE_DIRECT) {
ref = git_reference__alloc(node->name, &node->target.id, NULL);
- } else if (node->ref_type == GIT_REF_SYMBOLIC) {
+ } else if (node->ref_type == GIT_REFERENCE_SYMBOLIC) {
ref = git_reference__alloc_symbolic(node->name, node->target.symbolic);
} else {
abort();
@@ -305,9 +305,9 @@ static int update_target(git_refdb *db, transaction_node *node)
if (node->remove) {
error = git_refdb_unlock(db, node->payload, 2, false, ref, NULL, NULL);
- } else if (node->ref_type == GIT_REF_OID) {
+ } else if (node->ref_type == GIT_REFERENCE_DIRECT) {
error = git_refdb_unlock(db, node->payload, true, update_reflog, ref, node->sig, node->message);
- } else if (node->ref_type == GIT_REF_SYMBOLIC) {
+ } else if (node->ref_type == GIT_REFERENCE_SYMBOLIC) {
error = git_refdb_unlock(db, node->payload, true, update_reflog, ref, node->sig, node->message);
} else {
abort();
@@ -339,7 +339,7 @@ int git_transaction_commit(git_transaction *tx)
return error;
}
- if (node->ref_type != GIT_REF_INVALID) {
+ if (node->ref_type != GIT_REFERENCE_INVALID) {
if ((error = update_target(tx->db, node)) < 0)
return error;
}
diff --git a/src/transports/local.c b/src/transports/local.c
index 64a16891f..b8cc950ff 100644
--- a/src/transports/local.c
+++ b/src/transports/local.c
@@ -100,7 +100,7 @@ static int add_ref(transport_local *t, const char *name)
git_oid_cpy(&head->oid, &obj_id);
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC) {
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
head->symref_target = git__strdup(git_reference_symbolic_target(ref));
GITERR_CHECK_ALLOC(head->symref_target);
}
@@ -512,7 +512,7 @@ static int foreach_reference_cb(git_reference *reference, void *payload)
git_revwalk *walk = (git_revwalk *)payload;
int error;
- if (git_reference_type(reference) != GIT_REF_OID) {
+ if (git_reference_type(reference) != GIT_REFERENCE_DIRECT) {
git_reference_free(reference);
return 0;
}
diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c
index 10a5b4e2e..031f851d4 100644
--- a/src/transports/smart_protocol.c
+++ b/src/transports/smart_protocol.c
@@ -297,7 +297,7 @@ static int fetch_setup_walk(git_revwalk **out, git_repository *repo)
if ((error = git_reference_lookup(&ref, repo, refs.strings[i])) < 0)
goto on_error;
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC)
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC)
continue;
if ((error = git_revwalk_push(walk, git_reference_target(ref))) < 0)
View Lorry Controller Status