Skip to content

Fix #1071 #1386

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

Open
PicoJr wants to merge 1 commit into
base: develop
Choose a base branch
from
+12 −5
Open

Fix #1071 #1386

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
17 changes: 12 additions & 5 deletions src/cmds/git/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,16 +232,23 @@ fn run_show(
for arg in args {
cmd.arg(arg);
}
// https://github.com/rtk-ai/rtk/issues/1071
// git show <rev>:<path> cannot be filtered when blob is binary -> passthrough
// git show <rev> is still incorrectly filtered when it corresponds to a binary blob
if wants_blob_show {
let status = cmd.status().context("Failed to run git show")?;
timer.track_passthrough(
&format!("git show {}", args.join(" ")),
&format!("rtk git show {} (passthrough)", args.join(" ")),
);
return Ok(exit_code_from_status(&status, "git show"));
}
let result = exec_capture(&mut cmd).context("Failed to run git show")?;
if !result.success() {
eprintln!("{}", result.stderr);
return Ok(result.exit_code);
}
if wants_blob_show {
print!("{}", result.stdout);
} else {
println!("{}", result.stdout.trim());
}
println!("{}", result.stdout.trim());

timer.track(
&format!("git show {}", args.join(" ")),
Expand Down