Fix git show rev:path output formatting and duplication#248
Merged
pszymkowiak merged 1 commit intortk-ai:masterfrom Feb 28, 2026
Merged
Fix git show rev:path output formatting and duplication#248pszymkowiak merged 1 commit intortk-ai:masterfrom
pszymkowiak merged 1 commit intortk-ai:masterfrom
Conversation
heAdz0r
added a commit
to heAdz0r/rtk
that referenced
this pull request
Feb 28, 2026
…tk-ai#217, rtk-ai#196, rtk-ai#248, rtk-ai#211, rtk-ai#200, rtk-ai#192, rtk-ai#268) Wave 1 (critical bugs): - fix(registry): fi/done moved to IGNORED_EXACT — find no longer shadowed (rtk-ai#246) - fix(playwright): f64 duration, specs[] structure, --reporter=json after subcmd (rtk-ai#193) - fix(gh): should_passthrough_gh_view for --json/--jq/--template/--web in view_pr/issue/run (rtk-ai#217+196) Wave 2 (reliability): - fix(git): is_blob_show_arg — blob show passthrough without trailing-newline trim (rtk-ai#248) - fix(find): parse_find_args with native -name/-type/-maxdepth/-iname support (rtk-ai#211) - fix(main): graceful Clap fallback + parse_failures SQLite table + rtk gain --failures (rtk-ai#200) Wave 3 (UX): - feat(git): global options -C/-c/--git-dir/--work-tree/--no-pager/--no-optional-locks/--bare/--literal-pathspecs (rtk-ai#192) - feat(proxy): streaming output via spawn()+threads instead of buffered output() (rtk-ai#268) Tests: 1091 → 1117 (+26), 0 regressions Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Collaborator
|
Clean fix. The is_blob_show_arg heuristic (contains(':') && !starts_with('-')) correctly distinguishes HEAD:src/main.rs from --pretty=format:%h. Routing blob requests directly to All git tests pass. LGTM. |
6 tasks
maxkulish
added a commit
to maxkulish/rtk
that referenced
this pull request
Mar 2, 2026
Bug fixes (4): - fix(registry): move "fi"/"done" to IGNORED_EXACT to prevent shadowing find commands (rtk-ai#246) - fix(hook): filter docker compose rewrites to supported subcommands only (ps/logs/build), avoid hard failures on up/down/exec (rtk-ai#245) - fix(git): add is_blob_show_arg() to prevent duplicate output on git show rev:path style args (rtk-ai#248) - fix(go): surface build failures (build-output/build-fail/FailedBuild) in go test -json summary (rtk-ai#274) Features (2): - feat(mypy): add rtk mypy command with grouped error output, 80% token reduction; delegate from lint_cmd.rs; add hook rewrites and registry entries (rtk-ai#109) - feat(gain): add --project/-p flag to scope rtk gain stats to the current working directory; add shorten_path() display helper (rtk-ai#128) Tests: 501 passed (10 new tests added)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Title: Fix duplicate and truncated output for
git show rev:pathcommandsDescription
Motivation and Context
Previously, when using this tool to view the contents of a specific file at a specific revision (e.g.,
git show <rev>:<path>), the tool failed to recognize it as a raw blob request. Instead, it treated the output as a standard commit diff.This resulted in two critical bugs:
println!("{}", stdout.trim());. This stripped all intentional leading/trailing empty lines and forced an unwanted trailing newline.Steps to Reproduce the Bug:
Running a command piped to
grep, such as:Expected: A single line showing the matched function signature.
Actual: Duplicate matches returned because the wrapper output the entire file contents twice.
Changes Proposed
is_blob_show_arg: A helper function to detect therev:pathsyntax (arguments containing:and not starting with-).wants_blob_showflag: When a blob request is detected, the command execution routes to a strict passthrough mode.print!("{}", stdout);instead ofprintln!("{}", stdout.trim());, ensuring the raw file content is preserved exactly as Git outputs it.test_is_blob_show_argto verify the argument parsing logic handles branches, paths, and formatting flags correctly.Type of Change
Testing
test_is_blob_show_arg).rtk git show develop:modules/pairs_backtest.py | grepnow correctly outputs exactly one match, and file trailing newlines are perfectly preserved.