-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Prevent pihole -up
errors when local repository is dirty
#4798
Conversation
I think this is a good point to be a bit more verbose. Let users know we are stashing their changes and resetting and pulling. |
I tried to test this but testing failed, because I could not create a condition where there original code failed to update the repo. I made changes to the local repo (and even tried to committed them) and used the following script to trigger an "update".
|
I have the same problem to test. |
832d10c
to
4546384
Compare
Setting as draft. |
4546384
to
e4e3914
Compare
also adding line breaks for readability Signed-off-by: RD WebDesign <[email protected]>
9697937
to
18bfae0
Compare
I know sometimes an error happens (see issue 2255), but I'm not able to reproduce the exact conditions to trigger the error and test this PR. |
Closing this PR. I don't remember this error happening recently and there was no reliable way to test the code. |
Thank you for your contribution to the Pi-hole Community!
Please read the comments below to help us consider your Pull Request.
We are all volunteers and completing the process outlined will help us review your commits quicker.
Please make sure you
What does this PR aim to accomplish?:
When users make changes to their pi-hole code directly on
master
branch, the update fails becausegit
can't replace the code.Example: pi-hole/web#2255
This fixes this error.
How does this PR accomplish the above?:
Inverting the execution order (running
git reset --hard
beforegit pull
).What documentation changes (if any) are needed to support this PR?:
none
By submitting this pull request, I confirm the following:
git rebase
)