Skip to content

to be merged #15

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
merged 2 commits into from
Sep 28, 2025
Merged

to be merged #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
010300f
update interactive merge command
ozankasikci Sep 28, 2025
04d0090
update: README.md
ozankasikci Sep 28, 2025
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ After the binary is on your `PATH`, run `rsworktree --help` to explore the avail
## Environment

Set `RSWORKTREE_SHELL` to override the shell used by `rsworktree cd` (falls back to `$SHELL` or `/bin/sh`).

83 changes: 53 additions & 30 deletions src/commands/merge_pr_github/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ where
worktree_path: &Path,
pr_number: u64,
) -> color_eyre::Result<()> {
let mut detached_for_deletion = false;
if self.remove_local_branch {
self.detach_worktree_head(worktree_path)?;
detached_for_deletion = true;
}

let mut args = vec![
"pr".to_owned(),
"merge".to_owned(),
Expand All @@ -168,6 +174,9 @@ where
let branch_delete_failed = self.remove_local_branch && gh_branch_delete_failure(&output);

if !output.success && !branch_delete_failed {
if detached_for_deletion {
let _ = self.restore_worktree_branch(worktree_path, branch);
}
return Err(command_failure("gh", &args, &output));
}

Expand All @@ -187,7 +196,9 @@ where
);
}

self.restore_worktree_branch(worktree_path, branch)?;
if !self.remove_local_branch || branch_delete_failed {
self.restore_worktree_branch(worktree_path, branch)?;
}

if self.remove_remote_branch {
self.delete_remote_branch(repo_path, branch)?;
Expand All @@ -196,6 +207,24 @@ where
Ok(())
}

fn detach_worktree_head(&mut self, worktree_path: &Path) -> color_eyre::Result<()> {
let args = vec![
"switch".to_owned(),
"--detach".to_owned(),
"HEAD".to_owned(),
];
let output = self
.runner
.run("git", worktree_path, &args)
.wrap_err("failed to detach worktree with `git switch --detach`")?;

if !output.success {
return Err(command_failure("git", &args, &output));
}

Ok(())
}

fn restore_worktree_branch(
&mut self,
worktree_path: &Path,
Expand Down Expand Up @@ -449,6 +478,11 @@ mod tests {
"1".into(),
],
},
RecordedCall {
program: "git".into(),
dir: worktree_path.clone(),
args: vec!["switch".into(), "--detach".into(), "HEAD".into()],
},
RecordedCall {
program: "gh".into(),
dir: repo_root,
Expand All @@ -460,11 +494,6 @@ mod tests {
"--delete-branch".into(),
],
},
RecordedCall {
program: "git".into(),
dir: worktree_path.clone(),
args: vec!["switch".into(), "feature/test".into()],
},
]
);

Expand Down Expand Up @@ -615,6 +644,11 @@ mod tests {
"1".into(),
],
},
RecordedCall {
program: "git".into(),
dir: worktree_path.clone(),
args: vec!["switch".into(), "--detach".into(), "HEAD".into()],
},
RecordedCall {
program: "gh".into(),
dir: repo_root.clone(),
Expand All @@ -626,11 +660,6 @@ mod tests {
"--delete-branch".into(),
],
},
RecordedCall {
program: "git".into(),
dir: worktree_path.clone(),
args: vec!["switch".into(), "feature/remove".into()],
},
RecordedCall {
program: "git".into(),
dir: repo_root,
Expand Down Expand Up @@ -858,6 +887,12 @@ mod tests {
success: true,
status_code: Some(0),
}),
Ok(CommandOutput {
stdout: String::new(),
stderr: String::new(),
success: true,
status_code: Some(0),
}),
Ok(CommandOutput {
stdout: "Pull request successfully merged".into(),
stderr: "failed to delete local branch merge-cmd".into(),
Expand Down Expand Up @@ -899,6 +934,11 @@ mod tests {
"1".into(),
],
},
RecordedCall {
program: "git".into(),
dir: worktree_path.clone(),
args: vec!["switch".into(), "--detach".into(), "HEAD".into()],
},
RecordedCall {
program: "gh".into(),
dir: repo_root.clone(),
Expand Down Expand Up @@ -1024,12 +1064,6 @@ mod tests {
success: true,
status_code: Some(0),
}),
Ok(CommandOutput {
stdout: String::new(),
stderr: String::new(),
success: true,
status_code: Some(0),
}),
Ok(CommandOutput {
stdout: String::new(),
stderr: String::from("fatal: not a git repository"),
Expand All @@ -1040,7 +1074,7 @@ mod tests {

let mut command = MergePrGithubCommand::with_runner("feature/test".into(), runner);
let err = command.execute(&repo).unwrap_err();
assert!(err.to_string().contains("git switch"));
assert!(err.to_string().contains("git switch --detach"));

assert_eq!(
command.runner.calls,
Expand All @@ -1066,21 +1100,10 @@ mod tests {
"1".into(),
],
},
RecordedCall {
program: "gh".into(),
dir: repo_root,
args: vec![
"pr".into(),
"merge".into(),
"42".into(),
"--merge".into(),
"--delete-branch".into(),
],
},
RecordedCall {
program: "git".into(),
dir: worktree_path,
args: vec!["switch".into(), "feature/test".into()],
args: vec!["switch".into(), "--detach".into(), "HEAD".into()],
},
]
);
Expand Down