Fixed config.json blocking git pull updates#1243
Open
thelabcat wants to merge 8 commits into
Open
Conversation
- Git moved config.json to config_template.json - Used shutil.copy() to create the config file at the last minute before it's needed, so it is no longer directly tracked - I had my auto-formatter turned on in Kate, so there's a bunch of other non-functional changes. Is that a problem?
This reverts commit c98b2b7. Formatter moved stuff that needed to not be moved.
- Git moved config.json to config_template.json
- Used shutil.copy() to create the config file at the last minute before it's needed, so it is no longer directly tracked
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Now
git pullcan update a used Applio instance without runninggit resetfirst.Description
config.jsontoconfig_template.jsonapp.pycreateconfig.jsonviaconfig_template.jsonifconfig.jsondoes not exist.Motivation and Context
Myself and others have been repeatedly blocked from updating Applio via
git pullbecause Applio had changedconfig.json, which is a tracked file. This is apparently the correct way to update Applio, as Dione uses it, and would encounter the same issue.How has this been tested?
I pulled the changes to my own working Applio instance, and deleted my
config.jsonfile. Then, I ranrun-applio.sh, and it successfully created the config file before starting normally.I am using Artix Linux with OpenRC.
Types of changes
Checklist: