Rebasing onto libgit2/development: cleanup.

16 files changed, 11 insertions, 10 deletions

diff --git a/tests-clar/network/remotelocal.c b/tests-clar/network/remotelocal.c
index 86461b1e5..4bf9fb6d8 100644
--- a/tests-clar/network/remotelocal.c
+++ b/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;
diff --git a/tests-clar/refs/branches/listall.c b/tests-clar/refs/branches/listall.c
index b65378e35..8eb228d31 100644
--- a/tests-clar/refs/branches/listall.c
+++ b/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);
 }
diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c
index c069846e7..b8318923d 100644
--- a/tests-clar/refs/revparse.c
+++ b/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");
diff --git a/tests/resources/testrepo.git/logs/HEAD b/tests-clar/resources/testrepo.git/logs/HEAD
index b16c9b313..b16c9b313 100644
--- a/tests/resources/testrepo.git/logs/HEAD
+++ b/tests-clar/resources/testrepo.git/logs/HEAD
diff --git a/tests/resources/testrepo.git/logs/refs/heads/br2 b/tests-clar/resources/testrepo.git/logs/refs/heads/br2
index 4e27f6b8d..4e27f6b8d 100644
--- a/tests/resources/testrepo.git/logs/refs/heads/br2
+++ b/tests-clar/resources/testrepo.git/logs/refs/heads/br2
diff --git a/tests/resources/testrepo.git/logs/refs/heads/master b/tests-clar/resources/testrepo.git/logs/refs/heads/master
index e1c729a45..e1c729a45 100644
--- a/tests/resources/testrepo.git/logs/refs/heads/master
+++ b/tests-clar/resources/testrepo.git/logs/refs/heads/master
diff --git a/tests-clar/resources/testrepo.git/logs/refs/heads/not-good b/tests-clar/resources/testrepo.git/logs/refs/heads/not-good
new file mode 100644
index 000000000..bfbeacb8a
--- /dev/null
+++ b/tests-clar/resources/testrepo.git/logs/refs/heads/not-good
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Ben Straub <bstraub@github.com> 1336761944 -0700	branch: Created from master
diff --git a/tests/resources/testrepo.git/logs/refs/remotes/origin/HEAD b/tests-clar/resources/testrepo.git/logs/refs/remotes/origin/HEAD
index f1aac6d0f..f1aac6d0f 100644
--- a/tests/resources/testrepo.git/logs/refs/remotes/origin/HEAD
+++ b/tests-clar/resources/testrepo.git/logs/refs/remotes/origin/HEAD
diff --git a/tests-clar/resources/testrepo.git/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe b/tests-clar/resources/testrepo.git/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe
new file mode 100644
index 000000000..71019a636
--- /dev/null
+++ b/tests-clar/resources/testrepo.git/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe
@@ -0,0 +1,2 @@
+x
�M� F]s�����
41�x�(�I�����Kݽ/_��P@������!8�)es
+�	�N&FGSƄ�h�{+�C����Zzv�F�7Z��-����k�x\�[P�8��G�K/��^�l��>.4
\ No newline at end of file
diff --git a/tests/resources/testrepo.git/refs/heads/not-good b/tests-clar/resources/testrepo.git/refs/heads/not-good
index 3d8f0a402..3d8f0a402 100644
--- a/tests/resources/testrepo.git/refs/heads/not-good
+++ b/tests-clar/resources/testrepo.git/refs/heads/not-good
diff --git a/tests/resources/testrepo.git/refs/remotes/test/master b/tests-clar/resources/testrepo.git/refs/remotes/test/master
index 9536ad89c..9536ad89c 100644
--- a/tests/resources/testrepo.git/refs/remotes/test/master
+++ b/tests-clar/resources/testrepo.git/refs/remotes/test/master
diff --git a/tests-clar/resources/testrepo.git/refs/tags/hard_tag b/tests-clar/resources/testrepo.git/refs/tags/hard_tag
new file mode 100644
index 000000000..59ce65649
--- /dev/null
+++ b/tests-clar/resources/testrepo.git/refs/tags/hard_tag
@@ -0,0 +1 @@
+849a5e34a26815e821f865b8479f5815a47af0fe
diff --git a/tests-clar/resources/testrepo.git/refs/tags/wrapped_tag b/tests-clar/resources/testrepo.git/refs/tags/wrapped_tag
new file mode 100644
index 000000000..59ce65649
--- /dev/null
+++ b/tests-clar/resources/testrepo.git/refs/tags/wrapped_tag
@@ -0,0 +1 @@
+849a5e34a26815e821f865b8479f5815a47af0fe
diff --git a/tests/resources/testrepo.git/objects/d7/eddec7b3610726791785bf839065953f10341b b/tests/resources/testrepo.git/objects/d7/eddec7b3610726791785bf839065953f10341b
deleted file mode 100644
index 32fc53202..000000000
--- a/tests/resources/testrepo.git/objects/d7/eddec7b3610726791785bf839065953f10341b
+++ /dev/null
@@ -1,2 +0,0 @@
-x
�M� F]s�����
41�x�(�I�����Kݽ/_��P@������!8�)es
-�	�N&FGSƄ�h�{+�C����Zzv�F�7Z��-����k�x\�[P�X<:m쥗R�G������./
\ No newline at end of file
diff --git a/tests/resources/testrepo.git/refs/tags/hard_tag b/tests/resources/testrepo.git/refs/tags/hard_tag
deleted file mode 100644
index 1621c20d6..000000000
--- a/tests/resources/testrepo.git/refs/tags/hard_tag
+++ /dev/null
@@ -1 +0,0 @@
-d7eddec7b3610726791785bf839065953f10341b
diff --git a/tests/resources/testrepo.git/refs/tags/wrapped_tag b/tests/resources/testrepo.git/refs/tags/wrapped_tag
deleted file mode 100644
index 1621c20d6..000000000
--- a/tests/resources/testrepo.git/refs/tags/wrapped_tag
+++ /dev/null
@@ -1 +0,0 @@
-d7eddec7b3610726791785bf839065953f10341b