Skip to content

fix: gh pr edit/comment pass correct subcommand to gh #332

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
pszymkowiak merged 2 commits into from
Mar 6, 2026
Merged

fix: gh pr edit/comment pass correct subcommand to gh #332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d607dbb
fix: gh pr edit/comment pass correct subcommand to gh
skvale Mar 5, 2026
14bf0cb
smaller diff
skvale Mar 6, 2026
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
21 changes: 11 additions & 10 deletions src/gh_cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ fn run_pr(args: &[String], verbose: u8, ultra_compact: bool) -> Result<()> {
"create" => pr_create(&args[1..], verbose),
"merge" => pr_merge(&args[1..], verbose),
"diff" => pr_diff(&args[1..], verbose),
"comment" => pr_action("commented", &args[1..], verbose),
"edit" => pr_action("edited", &args[1..], verbose),
"comment" => pr_action("commented", &args, verbose),
"edit" => pr_action("edited", &args, verbose),
_ => run_passthrough("gh", "pr", args),
}
}
Expand Down Expand Up @@ -1070,32 +1070,33 @@ fn pr_diff(args: &[String], _verbose: u8) -> Result<()> {
/// Generic PR action handler for comment/edit
fn pr_action(action: &str, args: &[String], _verbose: u8) -> Result<()> {
let timer = tracking::TimedExecution::start();
let subcmd = &args[0];

let mut cmd = Command::new("gh");
cmd.args(["pr", action]);
cmd.arg("pr");
for arg in args {
cmd.arg(arg);
}

let output = cmd
.output()
.context(format!("Failed to run gh pr {}", action))?;
.context(format!("Failed to run gh pr {}", subcmd))?;
let stdout = String::from_utf8_lossy(&output.stdout).to_string();

if !output.status.success() {
let stderr = String::from_utf8_lossy(&output.stderr).to_string();
timer.track(
&format!("gh pr {}", action),
&format!("rtk gh pr {}", action),
&format!("gh pr {}", subcmd),
&format!("rtk gh pr {}", subcmd),
&stderr,
&stderr,
);
eprintln!("{}", stderr.trim());
std::process::exit(output.status.code().unwrap_or(1));
}

// Extract PR number from args
let pr_num = args
// Extract PR number from args (skip args[0] which is the subcommand)
let pr_num = args[1..]
.iter()
.find(|a| !a.starts_with('-'))
.map(|s| format!("#{}", s))
Expand All @@ -1112,8 +1113,8 @@ fn pr_action(action: &str, args: &[String], _verbose: u8) -> Result<()> {
};

timer.track(
&format!("gh pr {}", action),
&format!("rtk gh pr {}", action),
&format!("gh pr {}", subcmd),
&format!("rtk gh pr {}", subcmd),
&raw,
&filtered,
);
Expand Down
Loading