diff options
| -rw-r--r-- | include/git2/refs.h | 3 | ||||
| -rw-r--r-- | src/refs.c | 2 | ||||
| -rw-r--r-- | src/revwalk.c | 2 | ||||
| -rw-r--r-- | src/status.c | 2 | ||||
| -rw-r--r-- | src/transports/local.c | 2 | ||||
| -rw-r--r-- | tests-clar/refs/lookup.c | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/include/git2/refs.h b/include/git2/refs.h index 6f2ac3ce9..2073aabc5 100644 --- a/include/git2/refs.h +++ b/include/git2/refs.h @@ -40,7 +40,8 @@ GIT_EXTERN(int) git_reference_lookup(git_reference **reference_out, git_reposito * @param name The long name for the reference * @return 0 on success, -1 if name could not be resolved */ -GIT_EXTERN(int) git_reference_lookup_oid(git_oid *out, git_repository *repo, const char *name); +GIT_EXTERN(int) git_reference_name_to_oid( + git_oid *out, git_repository *repo, const char *name); /** * Create a new symbolic reference. diff --git a/src/refs.c b/src/refs.c index 6fffe3e6f..bea1f1724 100644 --- a/src/refs.c +++ b/src/refs.c @@ -1061,7 +1061,7 @@ int git_reference_lookup(git_reference **ref_out, return git_reference_lookup_resolved(ref_out, repo, name, 0); } -int git_reference_lookup_oid( +int git_reference_name_to_oid( git_oid *out, git_repository *repo, const char *name) { int error; diff --git a/src/revwalk.c b/src/revwalk.c index a88fc84c4..a62576038 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -494,7 +494,7 @@ static int push_ref(git_revwalk *walk, const char *refname, int hide) { git_oid oid; - if (git_reference_lookup_oid(&oid, walk->repo, refname) < 0) + if (git_reference_name_to_oid(&oid, walk->repo, refname) < 0) return -1; return push_commit(walk, &oid, hide); diff --git a/src/status.c b/src/status.c index d4f59e355..62cc37e2e 100644 --- a/src/status.c +++ b/src/status.c @@ -23,7 +23,7 @@ static int resolve_head_to_tree(git_tree **tree, git_repository *repo) git_oid head_oid; git_object *obj = NULL; - if (git_reference_lookup_oid(&head_oid, repo, GIT_HEAD_FILE) < 0) { + if (git_reference_name_to_oid(&head_oid, repo, GIT_HEAD_FILE) < 0) { /* cannot resolve HEAD - probably brand new repo */ giterr_clear(); *tree = NULL; diff --git a/src/transports/local.c b/src/transports/local.c index ba1cee4f1..5dc350103 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -35,7 +35,7 @@ static int add_ref(transport_local *t, const char *name) head->name = git__strdup(name); GITERR_CHECK_ALLOC(head->name); - if (git_reference_lookup_oid(&head->oid, t->repo, name) < 0 || + if (git_reference_name_to_oid(&head->oid, t->repo, name) < 0 || git_vector_insert(&t->refs, head) < 0) { git__free(head->name); diff --git a/tests-clar/refs/lookup.c b/tests-clar/refs/lookup.c index d9b6c260f..ab563ac2b 100644 --- a/tests-clar/refs/lookup.c +++ b/tests-clar/refs/lookup.c @@ -36,7 +36,7 @@ void test_refs_lookup__oid(void) { git_oid tag, expected; - cl_git_pass(git_reference_lookup_oid(&tag, g_repo, "refs/tags/point_to_blob")); + cl_git_pass(git_reference_name_to_oid(&tag, g_repo, "refs/tags/point_to_blob")); cl_git_pass(git_oid_fromstr(&expected, "1385f264afb75a56a5bec74243be9b367ba4ca08")); cl_assert(git_oid_cmp(&tag, &expected) == 0); } |