diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-18 13:14:09 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:10 -0700 |
| commit | 97f3462ae699fae370cfa410ed58eb869ae6b276 (patch) | |
| tree | 840b573fa746fd895086dd5d39d3de422cc165b2 /src/merge.c | |
| parent | d9fdee6e4cb87e4531d9ddba92b44e5323e794da (diff) | |
| download | libgit2-97f3462ae699fae370cfa410ed58eb869ae6b276.tar.gz | |
git_merge_status -> git_merge_analysis
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/merge.c b/src/merge.c index 66b8be684..6b416a3ef 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2517,8 +2517,8 @@ done: return error; } -int git_merge_status( - git_merge_status_t *out, +int git_merge_analysis( + git_merge_analysis_t *out, git_repository *repo, const git_merge_head **their_heads, size_t their_heads_len) @@ -2528,7 +2528,7 @@ int git_merge_status( assert(out && repo && their_heads); - *out = GIT_MERGE_STATUS_NORMAL; + *out = GIT_MERGE_ANALYSIS_NORMAL; if ((error = merge_heads(&ancestor_head, &our_head, repo, their_heads, their_heads_len)) < 0) goto done; @@ -2536,11 +2536,11 @@ int git_merge_status( if (their_heads_len == 1 && ancestor_head != NULL) { /* We're up-to-date if we're trying to merge our own common ancestor. */ if (git_oid_equal(&ancestor_head->oid, &their_heads[0]->oid)) - *out = GIT_MERGE_STATUS_UP_TO_DATE; + *out = GIT_MERGE_ANALYSIS_UP_TO_DATE; /* We're fastforwardable if we're our own common ancestor. */ else if (git_oid_equal(&ancestor_head->oid, &our_head->oid)) - *out = GIT_MERGE_STATUS_FASTFORWARD; + *out = GIT_MERGE_ANALYSIS_FASTFORWARD | GIT_MERGE_ANALYSIS_NORMAL; } done: |