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 the desktop.ini file in every directory, not only in top dir. #8299

Merged
merged 7 commits into from
Jan 21, 2021

Conversation

dragotin
Copy link
Contributor

See #8298 for reasons.

@jnweiger
Copy link
Contributor

The comment /* We create a Desktop.ini on Windows for the sidebar icon, make sure we don't sync it. */ should be updated.
It refers to one specific file. It does not explain why all Desktop.ini files in any subfolder must be suppressed.

@michaelstingl
Copy link
Contributor

See #8298 for reasons.

Why exclude desktop.ini in subfolders? Should be sufficient to fix the crash. desktop.ini in subfolders were intentionally allowed in 2.5. (#6404)

@dragotin
Copy link
Contributor Author

The desktop.ini file only concerns the local Explorer. If you sync it and the "other" computer does have a different screen resolution for example, things mit go wrong.

Check this: https://support.microsoft.com/en-us/office/invalid-file-names-and-file-types-in-onedrive-and-sharepoint-64883a5d-228e-48f5-b3d2-eb39e07630fa

OneDrive also does not sync desktop.ini. I still think we also should not.

@jnweiger
Copy link
Contributor

Imo, it should be always synced, but renamed to a safe name. E.g. desktop.ini._RENAMED

@@ -201,8 +201,8 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(const QString &path, bool exclu
#endif

/* We create a Desktop.ini on Windows for the sidebar icon, make sure we don't sync it. */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is now misleading.

@TheOneRing
Copy link
Member

Internal ci issues are fixed on 2.7 and master

@TheOneRing TheOneRing merged commit 52f8671 into master Jan 21, 2021
@TheOneRing TheOneRing deleted the never_sync_desktop_ini branch January 21, 2021 12:10
@sonarcloud
Copy link

sonarcloud bot commented Jan 21, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

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.

None yet

4 participants