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

[stable-3.14] do not ignore paths containing 2 "#" characters
nextcloud · Sep 9, 2024 · 815cbd5 · 815cbd5
2 parents 42daba2 + 297cdec
commit 815cbd5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/gui/ignorelisttablewidget.cpp b/src/gui/ignorelisttablewidget.cpp
@@ -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(']')) {

diff --git a/sync-exclude.lst b/sync-exclude.lst
@@ -49,6 +49,5 @@ System Volume Information
 
 My Saved Places.
 
-\#*#
 
 *.sb-*
diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp
@@ -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()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,6 +49,5 @@ System Volume Information

		My Saved Places.

		\#*#

		.sb-