From 942a7b39edad519748456ddce97cf77a93c9babc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Fri, 10 Oct 2014 18:03:09 +0200 Subject: [PATCH] Fix test build Some PRs have fallen out of sync with the changes in signatures, so we need to take a few extra parameters into account. --- tests/cherrypick/workdir.c | 2 +- tests/network/fetchlocal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/cherrypick/workdir.c b/tests/cherrypick/workdir.c index 9302186b5..86a385d16 100644 --- a/tests/cherrypick/workdir.c +++ b/tests/cherrypick/workdir.c @@ -118,7 +118,7 @@ void test_cherrypick_workdir__empty_result(void) cl_assert(git_path_exists(TEST_REPO_PATH "/file4.txt")); cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL, NULL)); + cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL, NULL, NULL)); git_oid_fromstr(&cherry_oid, cherrypick_oid); cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); diff --git a/tests/network/fetchlocal.c b/tests/network/fetchlocal.c index fb266f377..eb9a1087a 100644 --- a/tests/network/fetchlocal.c +++ b/tests/network/fetchlocal.c @@ -140,7 +140,7 @@ void test_network_fetchlocal__multi_remotes(void) cl_git_pass(git_remote_set_url(test, cl_git_fixture_url("testrepo.git"))); git_remote_set_callbacks(test, &callbacks); cl_git_pass(git_remote_connect(test, GIT_DIRECTION_FETCH)); - cl_git_pass(git_remote_download(test)); + cl_git_pass(git_remote_download(test, NULL)); cl_git_pass(git_remote_update_tips(test, NULL, NULL)); cl_git_pass(git_reference_list(&refnames, repo)); @@ -150,7 +150,7 @@ void test_network_fetchlocal__multi_remotes(void) cl_git_pass(git_remote_set_url(test2, cl_git_fixture_url("testrepo.git"))); git_remote_set_callbacks(test2, &callbacks); cl_git_pass(git_remote_connect(test2, GIT_DIRECTION_FETCH)); - cl_git_pass(git_remote_download(test2)); + cl_git_pass(git_remote_download(test2, NULL)); cl_git_pass(git_remote_update_tips(test2, NULL, NULL)); cl_git_pass(git_reference_list(&refnames, repo));