Skip to content

Fix message filter being put in wrong position by optimizer #1648

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

Merged
christian-schilling merged 1 commit into from
Dec 11, 2025
Merged

Fix message filter being put in wrong position by optimizer #1648

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
2 changes: 2 additions & 0 deletions josh-core/src/filter/opt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,8 @@ fn common_post(filters: &Vec<Filter>) -> Option<(Filter, Vec<Filter>)> {
common_post.map(|c| (c, rest))
} else if let Op::Prefix(_) = to_op(c) {
common_post.map(|c| (c, rest))
} else if let Op::Message(..) = to_op(c) {
Copy link
Member

@christian-schilling christian-schilling Dec 8, 2025

Choose a reason for hiding this comment

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

I wonder why this was limited to prefix in the first place. Maybe we should look into allowing factorizing all filters here instead of adding more special cases 🤔
Thoughts?

Copy link
Collaborator Author

@vlad-ivanov-name vlad-ivanov-name Dec 11, 2025

Choose a reason for hiding this comment

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

Would prefer to merge this as a hotfix and then create an issue. For all filters I think we'd need a good test strategy, maybe something like guided fuzzing to discover "unsound" edge cases

Copy link
Member

@christian-schilling christian-schilling Dec 11, 2025

Choose a reason for hiding this comment

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

Makes sense

common_post.map(|c| (c, rest))
} else {
None
}
Expand Down
21 changes: 21 additions & 0 deletions tests/filter/compose_message.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
$ export TESTTMP=${PWD}

$ cd ${TESTTMP}
$ git init -q repo 1> /dev/null
$ cd repo

$ mkdir -p mono extras
$ echo a > mono/a.txt
$ echo b > extras/b.txt
$ git add .
$ git commit -m "initial commit" 1> /dev/null

$ josh-filter -p ':[:/mono,:/extras]:"REWRITTEN"'
:[
:/mono
:/extras
]:"REWRITTEN"

$ josh-filter ':[:/mono,:/extras]:"REWRITTEN"' > /dev/null
$ git log --pretty=%B -1 FILTERED_HEAD
REWRITTEN