summaryrefslogtreecommitdiff
path: root/src/revparse.c
diff options
context:
space:
mode:
authorBen Straub <bs@github.com>2012-11-18 21:38:08 -0700
committerBen Straub <bs@github.com>2012-11-27 13:17:45 -0800
commit2508cc66eb91597b12dc19721d9cea1f06e72107 (patch)
tree89e0ec2a924d9dc6b66461f462afbb999045ad27 /src/revparse.c
parent469827812f95e979e3c6468567b2c9ed138a9849 (diff)
downloadlibgit2-2508cc66eb91597b12dc19721d9cea1f06e72107.tar.gz
Rename ref and reflog apis for consistency
Diffstat (limited to 'src/revparse.c')
-rw-r--r--src/revparse.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/revparse.c b/src/revparse.c
index 6b49402c4..79900c4cc 100644
--- a/src/revparse.c
+++ b/src/revparse.c
@@ -140,7 +140,7 @@ static int revparse_lookup_object(git_object **out, git_repository *repo, const
error = disambiguate_refname(&ref, repo, spec);
if (!error) {
- error = git_object_lookup(out, repo, git_reference_oid(ref), GIT_OBJ_ANY);
+ error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJ_ANY);
git_reference_free(ref);
return error;
}
@@ -203,7 +203,7 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out,
for (i = 0; i < numentries; i++) {
entry = git_reflog_entry_byindex(reflog, i);
- msg = git_reflog_entry_msg(entry);
+ msg = git_reflog_entry_message(entry);
if (regexec(&preg, msg, 2, regexmatches, 0))
continue;
@@ -263,7 +263,7 @@ static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, unsigned i
}
entry = git_reflog_entry_byindex(reflog, identifier);
- git_oid_cpy(oid, git_reflog_entry_oidnew(entry));
+ git_oid_cpy(oid, git_reflog_entry_id_new(entry));
error = 0;
goto cleanup;
@@ -278,7 +278,7 @@ static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, unsigned i
if (commit_time.time - identifier > 0)
continue;
- git_oid_cpy(oid, git_reflog_entry_oidnew(entry));
+ git_oid_cpy(oid, git_reflog_entry_id_new(entry));
error = 0;
goto cleanup;
}
@@ -306,7 +306,7 @@ static int retrieve_revobject_from_reflog(git_object **out, git_reference **base
}
if (position == 0) {
- error = git_object_lookup(out, repo, git_reference_oid(ref), GIT_OBJ_ANY);
+ error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJ_ANY);
goto cleanup;
}
@@ -632,7 +632,7 @@ static int object_from_reference(git_object **object, git_reference *reference)
if (git_reference_resolve(&resolved, reference) < 0)
return -1;
- error = git_object_lookup(object, reference->owner, git_reference_oid(resolved), GIT_OBJ_ANY);
+ error = git_object_lookup(object, reference->owner, git_reference_target(resolved), GIT_OBJ_ANY);
git_reference_free(resolved);
return error;