summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2014-03-30 19:56:18 -0700
committerEdward Thomson <ethomson@edwardthomson.com>2014-03-31 11:43:38 -0500
commit976634c4672f3e1144b8f11c6c984157a28f5d98 (patch)
tree7ef3b50b69f97777aad55c3f5f1569e1ce58fe7e /src
parent7b445c2195f1fff455d13218851fc683f5dd4058 (diff)
downloadlibgit2-976634c4672f3e1144b8f11c6c984157a28f5d98.tar.gz
Introduce git_merge_head_id
Diffstat (limited to 'src')
-rw-r--r--src/merge.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/merge.c b/src/merge.c
index 24b7d37ce..f9ed7b0a3 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -2736,6 +2736,14 @@ int git_merge_head_from_fetchhead(
return merge_head_init(out, repo, branch_name, remote_url, oid);
}
+const git_oid *git_merge_head_id(
+ const git_merge_head *head)
+{
+ assert(head);
+
+ return &head->oid;
+}
+
void git_merge_head_free(git_merge_head *head)
{
if (head == NULL)