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/annotated_commit.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/annotated_commit.h')
-rw-r--r-- | src/annotated_commit.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/annotated_commit.h b/src/annotated_commit.h new file mode 100644 index 000000000..e873184ae --- /dev/null +++ b/src/annotated_commit.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_annotated_commit_h__ +#define INCLUDE_annotated_commit_h__ + +#include "git2/oid.h" + +/** Internal structure for merge inputs */ +struct git_annotated_commit { + git_commit *commit; + + char *ref_name; + char *remote_url; + + char id_str[GIT_OID_HEXSZ+1]; +}; + +#endif |