Skip to content
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

lib/model: Don't update ignore hash when pull fails #4522

Closed
wants to merge 1 commit into from

Conversation

imsodin
Copy link
Member

@imsodin imsodin commented Nov 17, 2017

While reviewing the PR about pull scheduling on reconnect I realized that the ignores hash is incorrectly updated even if a pull fails. This means on a subsequent pull, ignored files aren't included anymore, which is relevant due to #4460, and should thus also be in v0.14.41.

@calmh
Copy link
Member

calmh commented Nov 17, 2017

Won't we have set the correct bits on all the ignored files as part of the pulling, even if some other files fail to pull for whatever reason?

@imsodin
Copy link
Member Author

imsodin commented Nov 17, 2017

Yes, that case is fine, the problem is the other way round: If a file got un-ignored and fails to be pulled, it won't get queried again.

@calmh
Copy link
Member

calmh commented Nov 17, 2017

Ah

@calmh
Copy link
Member

calmh commented Nov 17, 2017

@st-review merge

@st-review
Copy link

👌 Merged as 6cf01c1. Thanks, @imsodin!

st-review pushed a commit that referenced this pull request Nov 17, 2017
@st-review st-review closed this Nov 17, 2017
@imsodin imsodin deleted the ignHash branch November 17, 2017 12:43
@st-review st-review added the pr-merged Legacy label used in the past for pull requests merged to the main tree label Jan 15, 2018
@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Nov 18, 2018
@syncthing syncthing locked and limited conversation to collaborators Nov 18, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion pr-merged Legacy label used in the past for pull requests merged to the main tree
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants