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

cli: ensure rebase destinations are unique and not form a merge with root

Browse source
This commit is contained in:
Yuya Nishihara 2022-09-12 18:45:16 +09:00
parent cf0ab8b12b
commit b21a123bc8
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/commands.rs
View file

@ -4071,11 +4071,7 @@ fn cmd_merge(ui: &mut Ui, command: &CommandHelper, args: &NewArgs) -> Result<(),
fn cmd_rebase(ui: &mut Ui, command: &CommandHelper, args: &RebaseArgs) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?;
let mut new_parents = vec![];
for revision_str in &args.destination {
let destination = workspace_command.resolve_single_rev(revision_str)?;
new_parents.push(destination);
}
let new_parents = resolve_base_revs(&workspace_command, &args.destination)?;
if let Some(rev_str) = &args.revision {
rebase_revision(ui, &mut workspace_command, &new_parents, rev_str)?;
} else if let Some(source_str) = &args.source {

2
tests/test_rebase_command.rs
View file

@ -259,6 +259,8 @@ fn test_rebase_multiple_destinations() {
|/
o
"###);
test_env.jj_cmd_failure(&repo_path, &["rebase", "-r", "a", "-d", "b", "-d", "root"]);
}
#[test]