Skip to content

[pull] develop from rtk-ai:develop #36

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
pull merged 1 commit into from
Jun 17, 2026
+6 −3
Merged

[pull] develop from rtk-ai:develop #36

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
9 changes: 6 additions & 3 deletions src/cmds/system/grep_cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,9 @@ pub fn run(
for p in &patterns {
grep_cmd.args(["-e", p]);
}
grep_cmd.args(["-rnHZ", "--"]);
// --null (not -Z): on BSD/macOS grep -Z means --decompress, not the
// NUL filename separator parse_match_line() needs (issue #2310).
grep_cmd.args(["-rnH", "--null", "--"]);
grep_cmd.args(&paths);
exec_capture(&mut grep_cmd)
})
Expand Down Expand Up @@ -465,8 +467,9 @@ pub fn run(

/// Parses a single rg/grep match line of the form `file\0line_number:content`.
///
/// Requires the underlying command to be invoked with `-0` (rg) or `-Z` (grep)
/// so the filename is NUL-separated from `line:content`. NUL cannot appear in
/// Requires the underlying command to be invoked with `-0` (rg) or `--null`
/// (grep) so the filename is NUL-separated from `line:content`. NUL cannot
/// appear in
/// file paths, so the parser is unambiguous regardless of:
/// - content with `:` or `::` (e.g. `ClassRegistry::init(...)`, issue #1436);
/// - paths with embedded `:` (Windows drive letters, weird filenames like
Expand Down
Loading