mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7086 from nextcloud/backport/7084/stable-3.14

Browse Source 
[stable-3.14] do not ignore paths containing 2 "#" characters
This commit is contained in:
Matthieu Gallien 2024-09-09 11:23:54 +02:00 committed by GitHub
commit 815cbd5435
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/ignorelisttablewidget.cpp
View File

@ -127,6 +127,9 @@ void IgnoreListTableWidget::readIgnoreFile(const QString &file, bool readOnly)
while (!ignores.atEnd()) {
QString line = QString::fromUtf8(ignores.readLine());
line.chop(1);
if (line == QStringLiteral("\\#*#")) {
continue;
}
if (!line.isEmpty() && !line.startsWith("#")) {
bool deletable = false;
if (line.startsWith(']')) {

1
sync-exclude.lst
View File

@ -49,6 +49,5 @@ System Volume Information
My Saved Places.
\#*#
*.sb-*

2
test/testexcludedfiles.cpp
View File

@ -94,8 +94,6 @@ private slots:
QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden));
QVERIFY(excluded.isExcluded("/a/foo (conflicted copy bar)", "/a", keepHidden));
QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
QVERIFY(excluded.isExcluded("/a/#b#", "/a", keepHidden));
}
void check_csync_exclude_add()