diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/object.h | 14 | ||||
| -rw-r--r-- | include/git2/odb.h | 2 | ||||
| -rw-r--r-- | include/git2/odb_backend.h | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/include/git2/object.h b/include/git2/object.h index cadb942e0..83d37a263 100644 --- a/include/git2/object.h +++ b/include/git2/object.h @@ -56,7 +56,11 @@ GIT_BEGIN_DECL * @param type the type of the object * @return a reference to the object */ -GIT_EXTERN(int) git_object_lookup(git_object **object, git_repository *repo, const git_oid *id, git_otype type); +GIT_EXTERN(int) git_object_lookup( + git_object **object, + git_repository *repo, + const git_oid *id, + git_otype type); /** * Lookup a reference to one of the objects in a repostory, @@ -85,8 +89,12 @@ GIT_EXTERN(int) git_object_lookup(git_object **object, git_repository *repo, con * @param type the type of the object * @return a reference to the object */ -GIT_EXTERN(int) git_object_lookup_short_oid(git_object **object_out, git_repository *repo, - const git_oid *id, unsigned int len, git_otype type); +GIT_EXTERN(int) git_object_lookup_prefix( + git_object **object_out, + git_repository *repo, + const git_oid *id, + unsigned int len, + git_otype type); /** * Get the id (SHA1) of a repository object diff --git a/include/git2/odb.h b/include/git2/odb.h index 6c08ade54..42961463c 100644 --- a/include/git2/odb.h +++ b/include/git2/odb.h @@ -154,7 +154,7 @@ GIT_EXTERN(int) git_odb_read(git_odb_object **out, git_odb *db, const git_oid *i * - GIT_ENOTFOUND if the object is not in the database. * - GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix) */ -GIT_EXTERN(int) git_odb_read_unique_short_oid(git_oid *out_oid, git_odb_object **out, git_odb *db, const git_oid *short_id, unsigned int len); +GIT_EXTERN(int) git_odb_read_prefix(git_odb_object **out, git_odb *db, const git_oid *short_id, unsigned int len); /** * Read the header of an object from the database, without diff --git a/include/git2/odb_backend.h b/include/git2/odb_backend.h index 44049b6f1..796d2b9da 100644 --- a/include/git2/odb_backend.h +++ b/include/git2/odb_backend.h @@ -55,12 +55,12 @@ struct git_odb_backend { * remaining (GIT_OID_HEXSZ - len)*4 bits * are 0s. */ - int (* read_unique_short_oid)( + int (* read_prefix)( git_oid *, void **, size_t *, git_otype *, struct git_odb_backend *, const git_oid *, - unsigned int len); + unsigned int); int (* read_header)( size_t *, git_otype *, |