ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

rewrite: inline specialized rebase_commit_with_options() in rebase()

Browse source 
`rebase_commit_with_options()` now does very little, and we don't want
most of it in `rebase()`.
This commit is contained in:
Martin von Zweigbergk 2024-04-15 21:30:45 -07:00 committed by Martin von Zweigbergk
parent 2859277941
commit a5e6b1f997
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/src/rewrite.rs
View file

@ -100,11 +100,8 @@ pub fn rebase_commit(
new_parents: Vec<CommitId>,
) -> BackendResult<Commit> {
let rewriter = CommitRewriter::new(mut_repo, old_commit, new_parents);
let rebased_commit = rebase_commit_with_options(settings, rewriter, &Default::default())?;
match rebased_commit {
RebasedCommit::Rewritten(new_commit) => Ok(new_commit),
RebasedCommit::Abandoned { parent: _ } => panic!("Commit was unexpectedly abandoned"),
}
let builder = rewriter.rebase(settings)?;
builder.write()
}
/// Helps rewrite a commit.