diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/diff.h | 6 | ||||
| -rw-r--r-- | include/git2/index.h | 2 | ||||
| -rw-r--r-- | include/git2/merge.h | 8 | ||||
| -rw-r--r-- | include/git2/notes.h | 6 | ||||
| -rw-r--r-- | include/git2/sys/commit.h | 2 | ||||
| -rw-r--r-- | include/git2/tree.h | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index 76fb23654..a3cdd8193 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -203,7 +203,7 @@ typedef struct git_diff git_diff; typedef enum { GIT_DIFF_FLAG_BINARY = (1u << 0), /** file(s) treated as binary data */ GIT_DIFF_FLAG_NOT_BINARY = (1u << 1), /** file(s) treated as text data */ - GIT_DIFF_FLAG_VALID_OID = (1u << 2), /** `oid` value is known correct */ + GIT_DIFF_FLAG_VALID_ID = (1u << 2), /** `id` value is known correct */ } git_diff_flag_t; /** @@ -250,7 +250,7 @@ typedef enum { * be restricted to one of the `git_filemode_t` values. */ typedef struct { - git_oid oid; + git_oid id; const char *path; git_off_t size; uint32_t flags; @@ -361,7 +361,7 @@ typedef struct { uint16_t context_lines; /**< defaults to 3 */ uint16_t interhunk_lines; /**< defaults to 0 */ - uint16_t oid_abbrev; /**< default 'core.abbrev' or 7 if unset */ + uint16_t id_abbrev; /**< default 'core.abbrev' or 7 if unset */ git_off_t max_size; /**< defaults to 512MB */ const char *old_prefix; /**< defaults to "a" */ const char *new_prefix; /**< defaults to "b" */ diff --git a/include/git2/index.h b/include/git2/index.h index ffefad15d..4363a3b9b 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -56,7 +56,7 @@ typedef struct git_index_entry { unsigned int gid; git_off_t file_size; - git_oid oid; + git_oid id; unsigned short flags; unsigned short flags_extended; diff --git a/include/git2/merge.h b/include/git2/merge.h index ad9b5e2ea..3ef27e3c7 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -160,13 +160,13 @@ GIT_EXTERN(int) git_merge_head_from_fetchhead( * * @param out pointer to store the git_merge_head result in * @param repo repository that contains the given commit - * @param oid the commit object id to use as a merge input + * @param id the commit object id to use as a merge input * @return zero on success, -1 on failure. */ -GIT_EXTERN(int) git_merge_head_from_oid( +GIT_EXTERN(int) git_merge_head_from_id( git_merge_head **out, git_repository *repo, - const git_oid *oid); + const git_oid *id); /** * Frees a `git_merge_head` @@ -251,7 +251,7 @@ GIT_EXTERN(int) git_merge_result_is_fastforward(git_merge_result *merge_result); * @param out the OID of the fast-forward * @param merge_result the results of the merge */ -GIT_EXTERN(int) git_merge_result_fastforward_oid(git_oid *out, git_merge_result *merge_result); +GIT_EXTERN(int) git_merge_result_fastforward_id(git_oid *out, git_merge_result *merge_result); GIT_EXTERN(void) git_merge_result_free(git_merge_result *merge_result); diff --git a/include/git2/notes.h b/include/git2/notes.h index 0cb6ce5f1..98eb2aef3 100644 --- a/include/git2/notes.h +++ b/include/git2/notes.h @@ -106,12 +106,12 @@ GIT_EXTERN(const char *) git_note_message(const git_note *note); /** - * Get the note object OID + * Get the note object's id * * @param note the note - * @return the note object OID + * @return the note object's id */ -GIT_EXTERN(const git_oid *) git_note_oid(const git_note *note); +GIT_EXTERN(const git_oid *) git_note_id(const git_note *note); /** * Add a note for an object diff --git a/include/git2/sys/commit.h b/include/git2/sys/commit.h index 34a12fb15..c8ed56b66 100644 --- a/include/git2/sys/commit.h +++ b/include/git2/sys/commit.h @@ -29,7 +29,7 @@ GIT_BEGIN_DECL * the `tree`, neither the `parents` list of `git_oid`s are checked for * validity. */ -GIT_EXTERN(int) git_commit_create_from_oids( +GIT_EXTERN(int) git_commit_create_from_ids( git_oid *oid, git_repository *repo, const char *update_ref, diff --git a/include/git2/tree.h b/include/git2/tree.h index 6350ada9b..6669652ae 100644 --- a/include/git2/tree.h +++ b/include/git2/tree.h @@ -121,11 +121,11 @@ GIT_EXTERN(const git_tree_entry *) git_tree_entry_byindex( * Warning: this must examine every entry in the tree, so it is not fast. * * @param tree a previously loaded tree. - * @param oid the sha being looked for + * @param id the sha being looked for * @return the tree entry; NULL if not found */ -GIT_EXTERN(const git_tree_entry *) git_tree_entry_byoid( - const git_tree *tree, const git_oid *oid); +GIT_EXTERN(const git_tree_entry *) git_tree_entry_byid( + const git_tree *tree, const git_oid *id); /** * Retrieve a tree entry contained in a tree or in any of its subtrees, |