Merge pull request #2584 from jacquesg/pool-alignment

Pool/Index data is not aligned

3 files changed, 3 insertions, 3 deletions

diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c
index 154985f11..e3e703943 100644
--- a/tests/merge/merge_helpers.c
+++ b/tests/merge/merge_helpers.c
@@ -327,7 +327,7 @@ int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[],
 
 int dircount(void *payload, git_buf *pathbuf)
 {
-	int *entries = payload;
+	size_t *entries = payload;
 	size_t len = git_buf_len(pathbuf);
 
 	if (len < 5 || strcmp(pathbuf->ptr + (git_buf_len(pathbuf) - 5), "/.git") != 0)
diff --git a/tests/odb/foreach.c b/tests/odb/foreach.c
index 56daf7574..75448a2f7 100644
--- a/tests/odb/foreach.c
+++ b/tests/odb/foreach.c
@@ -87,7 +87,7 @@ void test_odb_foreach__files_in_objects_dir(void)
 	git_repository *repo;
 	git_odb *odb;
 	git_buf buf = GIT_BUF_INIT;
-	size_t nobj = 0;
+	int nobj = 0;
 
 	cl_fixture_sandbox("testrepo.git");
 	cl_git_pass(git_repository_open(&repo, "testrepo.git"));
diff --git a/tests/pack/packbuilder.c b/tests/pack/packbuilder.c
index 12273ec85..29f3e2d64 100644
--- a/tests/pack/packbuilder.c
+++ b/tests/pack/packbuilder.c
@@ -47,7 +47,7 @@ void test_pack_packbuilder__cleanup(void)
 	git_indexer_free(_indexer);
 	_indexer = NULL;
 
-	p_chdir("..");
+	cl_git_pass(p_chdir(".."));
 	cl_git_sandbox_cleanup();
 	_repo = NULL;
 }