Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set the checkout strategy to 'force' in GuiThemeDownloader to overwrite local changes if there are conflicts

Browse source
This commit is contained in:
Leon Styhre 2023-04-03 17:50:11 +02:00
parent 6c1ec7e7e6
commit 3f2ba517e4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
es-app/src/guis/GuiThemeDownloader.cpp
View file

@ -244,7 +244,7 @@ bool GuiThemeDownloader::fetchRepository(const std::string& repositoryName, bool
#else #else
git_checkout_options checkoutOptions = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options checkoutOptions = GIT_CHECKOUT_OPTIONS_INIT;
#endif #endif
checkoutOptions.checkout_strategy = GIT_CHECKOUT_SAFE; checkoutOptions.checkout_strategy = GIT_CHECKOUT_FORCE;
errorCode = git_checkout_tree(repository, object, &checkoutOptions); errorCode = git_checkout_tree(repository, object, &checkoutOptions);
errorCode = git_repository_set_head(repository, branchName.c_str()); errorCode = git_repository_set_head(repository, branchName.c_str());
@ -334,7 +334,7 @@ bool GuiThemeDownloader::fetchRepository(const std::string& repositoryName, bool
#else #else
git_checkout_options checkoutOptions = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options checkoutOptions = GIT_CHECKOUT_OPTIONS_INIT;
#endif #endif
checkoutOptions.checkout_strategy = GIT_CHECKOUT_SAFE; checkoutOptions.checkout_strategy = GIT_CHECKOUT_FORCE;
git_checkout_tree(repository, object, &checkoutOptions); git_checkout_tree(repository, object, &checkoutOptions);
errorCode = git_reference_set_target(&newTargetRef, oldTargetRef, objectID, nullptr); errorCode = git_reference_set_target(&newTargetRef, oldTargetRef, objectID, nullptr);
@ -1261,7 +1261,7 @@ bool GuiThemeDownloader::cloneRepository(const std::string& repositoryName, cons
git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT; git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT;
#endif #endif
cloneOptions.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; cloneOptions.checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
cloneOptions.fetch_opts.callbacks.transfer_progress = fetchProgressFunc; cloneOptions.fetch_opts.callbacks.transfer_progress = fetchProgressFunc;
mReceivedObjectsProgress = 0.0f; mReceivedObjectsProgress = 0.0f;