diff options
author | Russell Belfer <rb@github.com> | 2014-02-07 16:14:17 -0800 |
---|---|---|
committer | Russell Belfer <rb@github.com> | 2014-02-07 16:14:17 -0800 |
commit | 2d9291943c253e9e1520f87b13abb1e81cffdb29 (patch) | |
tree | 653489f8d29124bb0a6d32d14dfed9d9974bc267 /tests/refs | |
parent | 57c47af107b45b73a46a1d157f8f758edd536bc7 (diff) | |
parent | db55bb73ff4bccbaccbb4c3a7f6b1fcf09498df7 (diff) | |
download | libgit2-2d9291943c253e9e1520f87b13abb1e81cffdb29.tar.gz |
Merge pull request #2099 from libgit2/bs/more-reflog-stuff
More reflogness
Diffstat (limited to 'tests/refs')
-rw-r--r-- | tests/refs/branches/create.c | 9 | ||||
-rw-r--r-- | tests/refs/branches/delete.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/refs/branches/create.c b/tests/refs/branches/create.c index abe5f5940..94ecc0bca 100644 --- a/tests/refs/branches/create.c +++ b/tests/refs/branches/create.c @@ -29,15 +29,16 @@ void test_refs_branches_create__cleanup(void) static void retrieve_target_from_oid(git_commit **out, git_repository *repo, const char *sha) { - git_oid oid; + git_object *obj; - cl_git_pass(git_oid_fromstr(&oid, sha)); - cl_git_pass(git_commit_lookup(out, repo, &oid)); + cl_git_pass(git_revparse_single(&obj, repo, sha)); + cl_git_pass(git_commit_lookup(out, repo, git_object_id(obj))); + git_object_free(obj); } static void retrieve_known_commit(git_commit **commit, git_repository *repo) { - retrieve_target_from_oid(commit, repo, "e90810b8df3e80c413d903f631643c716887138d"); + retrieve_target_from_oid(commit, repo, "e90810b8df3"); } #define NEW_BRANCH_NAME "new-branch-on-the-block" diff --git a/tests/refs/branches/delete.c b/tests/refs/branches/delete.c index 7d1d400c8..ed5f1627b 100644 --- a/tests/refs/branches/delete.c +++ b/tests/refs/branches/delete.c @@ -78,7 +78,7 @@ void test_refs_branches_delete__can_delete_a_branch_pointed_at_by_detached_HEAD( git_reference_free(head); /* Detach HEAD and make it target the commit that "master" points to */ - git_repository_detach_head(repo); + git_repository_detach_head(repo, NULL, NULL); cl_git_pass(git_branch_lookup(&branch, repo, "master", GIT_BRANCH_LOCAL)); cl_git_pass(git_branch_delete(branch)); |