flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-29 18:38:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

cLib gitPull: The other parent can be the annotated commit

Browse Source 
What is an annotated commit? This library doesn't make much sense to me.
The merge.c example for libgit2 also doesn't make that much sense.
This commit is contained in:
Vishesh Handa
2019-05-16 11:36:48 +02:00
parent 0f63553363
commit 5a0a26fe37
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gj_common/gitjournal.c
View File

@ -517,30 +517,16 @@ int gj_git_pull(const char *git_base_path, const char *author_name, const char *
goto cleanup;
// Get the parents
git_oid head_id, origin_head_id;
git_oid head_id;
err = git_reference_name_to_id(&head_id, repo, "HEAD");
if (err < 0)
goto cleanup;
git_object *obj = NULL;
err = git_revparse_single(&obj, repo, "6fb95a2ae97cc");
if (err < 0)
goto cleanup;
origin_head_id = *git_object_id(obj);
/*
err = git_reference_lookup(&head_id, repo, git_object_id(obj));
if (err < 0)
goto cleanup;
*/
err = git_commit_lookup(&head_commit, repo, &head_id);
if (err < 0)
goto cleanup;
printf("Looked up head commit\n");
err = git_commit_lookup(&origin_head_commit, repo, &origin_head_id);
err = git_commit_lookup(&origin_head_commit, repo, git_annotated_commit_id(annotated_commit));
if (err < 0)
goto cleanup;