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

Ignore unexpected files in intermediate directories #221

Conversation

MichaelEischer
Copy link
Member

@MichaelEischer MichaelEischer commented Apr 8, 2023

What is the purpose of this change? What does it change?

Listing the data/ folder in a repository no longer fails if it contains files in the data/ folder. This also ignores .DS_Store files created by macOS.

Was the change discussed in an issue or in the forum before?

Fixes #219.

Checklist

  • I have enabled maintainer edits for this PR
  • I have added tests for all changes in this PR
  • [ ] I have added documentation for the changes (in the manual)
  • There's a new file in changelog/unreleased/ that describes the changes for our users (template here)
  • I have run gofmt on the code in all commits
  • All commit messages are formatted in the same style as the other commits in the repo
  • I'm done, this Pull Request is ready for review

Listing the data/ folder in a repository no longer fails if it contains
files in the data/ folder. This also ignore .DS_Store files created by
macOS.
@MichaelEischer
Copy link
Member Author

Looks like we had zero test coverage for listBlobsV2(). I've added a basic test that checks that unexpected files don't cause problems for both listBlobsV1 and V2.

@MichaelEischer
Copy link
Member Author

LGTM.

@MichaelEischer MichaelEischer merged commit 337035c into restic:master Apr 22, 2023
4 checks passed
@MichaelEischer MichaelEischer deleted the skip-files-in-intermediate-directories branch April 22, 2023 09:20
@hollie
Copy link

hollie commented Apr 22, 2023

Thank you Michael!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Backup repository check fails when server is running on OS X
2 participants