diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-25 04:14:37 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-25 08:15:44 +0100 |
| commit | a1bbc0ce205b6d3496338d3253c847aa91cabc7b (patch) | |
| tree | 7996f70c77019597585c796c800ff15f15c867eb /src/merge.c | |
| parent | 86bfc3e1c64c2c0277f1e795c0a15cba992ac6f5 (diff) | |
| download | libgit2-a1bbc0ce205b6d3496338d3253c847aa91cabc7b.tar.gz | |
merge: rename _oid() -> id()
Following the rest of the series, use 'id' when refering to the value.
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/merge.c b/src/merge.c index ee000d522..f4224955a 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2111,7 +2111,7 @@ static int merge_ancestor_head( if ((error = git_merge_base_many(&ancestor_oid, repo, their_heads_len + 1, oids)) < 0) goto on_error; - error = git_merge_head_from_oid(ancestor_head, repo, &ancestor_oid); + error = git_merge_head_from_id(ancestor_head, repo, &ancestor_oid); on_error: git__free(oids); @@ -2615,7 +2615,7 @@ int git_merge_result_is_fastforward(git_merge_result *merge_result) return merge_result->is_fastforward; } -int git_merge_result_fastforward_oid(git_oid *out, git_merge_result *merge_result) +int git_merge_result_fastforward_id(git_oid *out, git_merge_result *merge_result) { assert(out && merge_result); @@ -2699,7 +2699,7 @@ int git_merge_head_from_ref( return error; } -int git_merge_head_from_oid( +int git_merge_head_from_id( git_merge_head **out, git_repository *repo, const git_oid *oid) |