diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-10-03 19:02:29 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-10-26 22:59:48 -0400 |
| commit | 18b00406c6427eb8c9d96864448474e1d85017de (patch) | |
| tree | ee02fd12ee4b8f84e5ed53ca59ac771734bba16e /src/merge.h | |
| parent | 796b03bd4969f170d8e7a7c9edd567f636b58cb3 (diff) | |
| download | libgit2-18b00406c6427eb8c9d96864448474e1d85017de.tar.gz | |
s/git_merge_head/git_annotated_commit
Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/merge.h b/src/merge.h index cc17389ab..2684c15f8 100644 --- a/src/merge.h +++ b/src/merge.h @@ -110,16 +110,6 @@ typedef struct { int binary:1; } git_merge_diff; -/** Internal structure for merge inputs */ -struct git_merge_head { - char *ref_name; - char *remote_url; - - git_oid oid; - char oid_str[GIT_OID_HEXSZ+1]; - git_commit *commit; -}; - int git_merge__bases_many( git_commit_list **out, git_revwalk *walk, @@ -145,8 +135,8 @@ void git_merge_diff_list__free(git_merge_diff_list *diff_list); int git_merge__setup( git_repository *repo, - const git_merge_head *our_head, - const git_merge_head *heads[], + const git_annotated_commit *our_head, + const git_annotated_commit *heads[], size_t heads_len); int git_merge__check_result(git_repository *repo, git_index *index_new); |