Rebasing onto libgit2/development: cleanup.

tests-clar/network/remotelocal.c

@@ -98,7 +98,7 @@ void test_network_remotelocal__retrieve_advertised_references(void)
 
 	cl_git_pass(git_remote_ls(remote, &count_ref__cb, &how_many_refs));
 
-	cl_assert_equal_i(how_many_refs, 19);
+	cl_assert_equal_i(how_many_refs, 20);
 }
 
 void test_network_remotelocal__retrieve_advertised_references_from_spaced_repository(void)
@@ -112,7 +112,7 @@ void test_network_remotelocal__retrieve_advertised_references_from_spaced_reposi
 
 	cl_git_pass(git_remote_ls(remote, &count_ref__cb, &how_many_refs));
 
-	cl_assert_equal_i(how_many_refs, 19);
+	cl_assert_equal_i(how_many_refs, 20);
 
 	git_remote_free(remote);	/* Disconnect from the "spaced repo" before the cleanup */
 	remote = NULL;

tests-clar/refs/branches/listall.c

@@ -35,7 +35,7 @@ static void assert_retrieval(unsigned int flags, unsigned int expected_count)
 
 void test_refs_branches_listall__retrieve_all_branches(void)
 {
-	assert_retrieval(GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE, 8);
+	assert_retrieval(GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE, 9);
 }
 
 void test_refs_branches_listall__retrieve_remote_branches(void)
@@ -45,5 +45,5 @@ void test_refs_branches_listall__retrieve_remote_branches(void)
 
 void test_refs_branches_listall__retrieve_local_branches(void)
 {
-	assert_retrieval(GIT_BRANCH_LOCAL, 6);
+	assert_retrieval(GIT_BRANCH_LOCAL, 7);
 }

tests-clar/refs/revparse.c

@@ -13,7 +13,7 @@ static void test_object(const char *spec, const char *expected_oid)
    char objstr[64] = {0};
 
    cl_git_pass(git_revparse_single(&g_obj, g_repo, spec));
-   git_oid_to_string(objstr, 64, git_object_id(g_obj));
+   git_oid_fmt(objstr, git_object_id(g_obj));
    cl_assert_equal_s(objstr, expected_oid);
 
    git_object_free(g_obj);
@@ -131,7 +131,7 @@ void test_refs_revparse__revwalk(void)
    cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/not found in any commit}"));
    cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/merge}"));
    cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/((}"));
-   cl_assert(strstr(git_lasterror(), "parentheses not balanced") != NULL);
+   cl_assert(strstr(giterr_last()->message, "parentheses not balanced") != NULL);
 
    test_object("master^{/anoth}", "5b5b025afb0b4c913b4c338a42934a3863bf3644");
    test_object("master^{/Merge}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");

tests-clar/resources/testrepo.git/logs/refs/heads/not-good

+0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Ben Straub <bstraub@github.com> 1336761944 -0700	branch: Created from master

tests-clar/resources/testrepo.git/refs/tags/hard_tag

+849a5e34a26815e821f865b8479f5815a47af0fe

tests-clar/resources/testrepo.git/refs/tags/wrapped_tag

+849a5e34a26815e821f865b8479f5815a47af0fe

tests/resources/testrepo.git/refs/tags/hard_tag

-d7eddec7b3610726791785bf839065953f10341b

tests/resources/testrepo.git/refs/tags/wrapped_tag

-d7eddec7b3610726791785bf839065953f10341b