loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update libgit2 to v0.23.0.

Browse Source 
As well as API changes, a couple more libraries needed to be linked
against to resolve symbol errors.
This commit is contained in:
Oliver Hamlet
2015-07-10 00:01:30 +01:00
parent f7b382ac08
commit 55fe6d0d46
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -1
View File
@@ -233,7 +233,10 @@ ELSEIF (MSVC)
version
loadorder${PROJECT_ARCH}
ws2_32
shlwapi)
shlwapi
winhttp
crypt32
Rpcrt4)
set (LOOT_GUI_LIBS ${LOOT_LIBS}
cef_sandbox
libcef
src/backend/helpers/git_helper.cpp
+1 -4
View File
@@ -43,7 +43,6 @@ namespace loot {
commit(nullptr),
ref(nullptr),
ref2(nullptr),
sig(nullptr),
blob(nullptr),
annotated_commit(nullptr),
tree(nullptr),
@@ -101,7 +100,6 @@ namespace loot {
git_repository_free(repo);
git_reference_free(ref);
git_reference_free(ref2);
git_signature_free(sig);
git_blob_free(blob);
git_annotated_commit_free(annotated_commit);
git_tree_free(tree);
@@ -115,7 +113,6 @@ namespace loot {
repo = nullptr;
ref = nullptr;
ref2 = nullptr;
sig = nullptr;
blob = nullptr;
annotated_commit = nullptr;
tree = nullptr;
@@ -170,7 +167,7 @@ namespace loot {
GitHelper::git_diff_payload payload;
payload.fileFound = false;
payload.fileToFind = filename.c_str();
git.Call(git_diff_foreach(git.diff, &git.diff_file_cb, NULL, NULL, &payload));
git.Call(git_diff_foreach(git.diff, &git.diff_file_cb, NULL, NULL, NULL, &payload));
// Clean up memory
git_object_free(git.obj);
src/backend/helpers/git_helper.h
-1
View File
@@ -56,7 +56,6 @@ namespace loot {
git_commit * commit;
git_reference * ref;
git_reference * ref2;
git_signature * sig;
git_blob * blob;
git_annotated_commit * annotated_commit;
git_tree * tree;
src/backend/masterlist.cpp
+11 -14
View File
@@ -126,10 +126,6 @@ namespace loot {
string filename = path.filename().string();
// First initialise some stuff that isn't specific to a repository.
BOOST_LOG_TRIVIAL(debug) << "Creating a reflog signature to use.";
// Create a reflog signature for any changes.
git.Call(git_signature_new(&git.sig, "LOOT", "loot@placeholder.net", 0, 0));
BOOST_LOG_TRIVIAL(debug) << "Setting up checkout options.";
char * paths = new char[filename.length() + 1];
strcpy(paths, filename.c_str());
@@ -172,7 +168,6 @@ namespace loot {
clone_options.checkout_opts = checkout_opts;
clone_options.bare = 0;
clone_options.checkout_branch = repoBranch.c_str();
clone_options.signature = git.sig;
//Now perform the clone.
git.Call(git_clone(&git.repo, repoURL.c_str(), repo_path.string().c_str(), &clone_options));
@@ -209,17 +204,19 @@ namespace loot {
if (url != repoURL) {
BOOST_LOG_TRIVIAL(info) << "URLs do not match, setting repository URL to URL in settings.";
// The URLs don't match. Change the remote URL to match the one LOOT has.
git.Call(git_remote_set_url(git.remote, repoURL.c_str()));
git.Call(git_remote_set_url(git.repo, "origin", repoURL.c_str()));
// Now save change.
git.Call(git_remote_save(git.remote));
// Reload the remote object.
git_remote_free(git.remote);
git.Call(git_remote_lookup(&git.remote, git.repo, "origin"));
}
// Now fetch updates from the remote.
BOOST_LOG_TRIVIAL(trace) << "Fetching updates from remote.";
git.SetErrorMessage(lc::translate("An error occurred while trying to update the masterlist. This could be due to a server-side error. Try again in a few minutes."));
git.Call(git_remote_fetch(git.remote, nullptr, git.sig, nullptr));
git_fetch_options fetch_options = GIT_FETCH_OPTIONS_INIT;
git.Call(git_remote_fetch(git.remote, nullptr, &fetch_options, nullptr));
// Print some stats on what was fetched either during update or clone.
const git_transfer_progress * stats = git_remote_stats(git.remote);
@@ -238,7 +235,7 @@ namespace loot {
BOOST_LOG_TRIVIAL(trace) << "Creating the new branch.";
// Create a branch.
git.Call(git_commit_lookup(&git.commit, git.repo, commit_id));
git.Call(git_branch_create(&git.ref, git.repo, repoBranch.c_str(), git.commit, 0, git.sig, NULL));
git.Call(git_branch_create(&git.ref, git.repo, repoBranch.c_str(), git.commit, 0));
// Set upstream. Don't really know if this is necessary or not.
git.Call(git_branch_set_upstream(git.ref, (string("origin/") + repoBranch).c_str()));
@@ -258,7 +255,7 @@ namespace loot {
// Check if HEAD points to the desired branch and set it to if not.
if (!git_branch_is_head(git.ref)) {
BOOST_LOG_TRIVIAL(trace) << "Setting HEAD to follow branch: " << repoBranch;
git.Call(git_repository_set_head(git.repo, (string("refs/heads/") + repoBranch).c_str(), git.sig, (string("Updated HEAD to ") + repoBranch).c_str()));
git.Call(git_repository_set_head(git.repo, (string("refs/heads/") + repoBranch).c_str()));
}
if (ret == 0) {
@@ -289,7 +286,7 @@ namespace loot {
git.obj = nullptr;
// Set the reference target.
git.Call(git_reference_set_target(&git.ref2, git.ref, commit_id, git.sig, "Setting branch reference."));
git.Call(git_reference_set_target(&git.ref2, git.ref, commit_id, "Setting branch reference."));
git_reference_free(git.ref2);
git.ref2 = nullptr;
@@ -320,7 +317,7 @@ namespace loot {
if (local_commit_id->id != remote_commit_id->id) {
BOOST_LOG_TRIVIAL(trace) << "Branch heads are not equal, updating local HEAD.";
// Commit IDs don't match, update HEAD, and continue with normal update procedure.
git.Call(git_reference_set_target(&git.ref2, git.ref, remote_commit_id, git.sig, "Setting branch reference."));
git.Call(git_reference_set_target(&git.ref2, git.ref, remote_commit_id, "Setting branch reference."));
git_reference_free(git.ref2);
git.ref2 = nullptr;
}
@@ -423,7 +420,7 @@ namespace loot {
git.obj = nullptr;
// Detach HEAD to HEAD~1. This will roll back HEAD by one commit each time it is called.
git.Call(git_repository_set_head_detached(git.repo, oid, git.sig, "Updated HEAD to HEAD~1"));
git.Call(git_repository_set_head_detached(git.repo, oid));
// Checkout the new HEAD.
BOOST_LOG_TRIVIAL(trace) << "Performing a Git checkout of HEAD.";