diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-07-26 17:52:20 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-07-26 17:52:20 +0100 |
| commit | 1e84d74eb9300bdb47715e4e3515d441454dbbe0 (patch) | |
| tree | 852e767bca0910156606f8b28c567da4550d01a4 | |
| parent | Fix warnings in domain/converters (diff) | |
| download | gentoobrowse-api-0.12.5.tar.bz2 gentoobrowse-api-0.12.5.tar.xz gentoobrowse-api-0.12.5.zip | |
Fix fetching remote repoHEADgentoobrowse-api-0.12.5main
Updates test details to match master->main branch rename.
Fixes refspec which doesn't actually have the local branch name in it.
| -rw-r--r-- | gentoobrowse-api/service/utils/git.cpp | 6 | ||||
| -rw-r--r-- | gentoobrowse-api/unittests/testMaintenance.cpp | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/gentoobrowse-api/service/utils/git.cpp b/gentoobrowse-api/service/utils/git.cpp index 140c41f..8fc7c4a 100644 --- a/gentoobrowse-api/service/utils/git.cpp +++ b/gentoobrowse-api/service/utils/git.cpp @@ -34,10 +34,8 @@ namespace Gentoo::Utils::Git { { auto opts = gitSafeGet(git_fetch_init_options, static_cast<unsigned int>(GIT_FETCH_OPTIONS_VERSION)); opts.prune = GIT_FETCH_PRUNE; - opts.update_fetchhead = 1; - auto localBranch = gitSafeGet(git_repository_head, git_reference_free, repo); - auto localBranchName = gitSafeGet(git_branch_name, localBranch.get()); - auto refspec = RefSpec::get(localBranchName, git_remote_name(remote), remoteBranchName); + opts.update_fetchhead = GIT_REMOTE_UPDATE_FETCHHEAD; + auto refspec = RefSpec::get(remoteBranchName, git_remote_name(remote), remoteBranchName); std::array<char *, 1> s {refspec.data()}; git_strarray refs = {s.data(), 1}; gitSafe(git_remote_fetch, remote, &refs, &opts, nullptr); diff --git a/gentoobrowse-api/unittests/testMaintenance.cpp b/gentoobrowse-api/unittests/testMaintenance.cpp index 42691e4..4f4179e 100644 --- a/gentoobrowse-api/unittests/testMaintenance.cpp +++ b/gentoobrowse-api/unittests/testMaintenance.cpp @@ -274,7 +274,7 @@ BOOST_AUTO_TEST_CASE(testUpdateGitRepository) git_repository * repo; BOOST_REQUIRE_EQUAL(0, git_repository_init(&repo, testRepo.c_str(), false)); git_remote * origin; - BOOST_REQUIRE_EQUAL(0, git_remote_create(&origin, repo, "origin", "http://git.randomdan.homeip.net/git/portage")); + BOOST_REQUIRE_EQUAL(0, git_remote_create(&origin, repo, "origin", "https://git.randomdan.homeip.net/git/portage")); git_remote_free(origin); auto commitOid = create_initial_commit(repo); std::array<char, GIT_OID_HEXSZ + 1> commit {}; @@ -287,9 +287,9 @@ BOOST_AUTO_TEST_CASE(testUpdateGitRepository) insRepo->bindParamS(0, "testrepo"); insRepo->bindParamS(1, testRepo.string()); insRepo->bindParamS(2, "origin"); - insRepo->bindParamS(3, "master"); + insRepo->bindParamS(3, "main"); insRepo->bindParamS(4, commit.data()); - insRepo->execute(); + BOOST_REQUIRE_NO_THROW(insRepo->execute()); // Update m->updateRepositories(); |