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.

Sign up for GitHub

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

[stable-3.12] do not ignore paths containing 2 "#" characters #7088

Merged
merged 1 commit into from
Sep 9, 2024
Merged

[stable-3.12] do not ignore paths containing 2 "#" characters #7088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/gui/ignorelisttablewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(']')) {
Expand Down
1 change: 0 additions & 1 deletion sync-exclude.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,5 @@ System Volume Information

My Saved Places.

\#*#

*.sb-*
2 changes: 0 additions & 2 deletions test/testexcludedfiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,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()
Expand Down
Loading