mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-04 10:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

cleanup: format commands.rs, missed in previous commit

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-01-27 20:45:53 -08:00
parent d588a309da
commit bedf96475d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/commands.rs
View file

@ -3157,7 +3157,11 @@ fn cmd_rebase(ui: &mut Ui, command: &CommandHelper, args: &ArgMatches) -> Result
}
workspace_command.check_rewriteable(&old_commit)?;
for parent in &new_parents {
if workspace_command.repo.index().is_ancestor(old_commit.id(), parent.id()) {
if workspace_command
.repo
.index()
.is_ancestor(old_commit.id(), parent.id())
{
return Err(CommandError::UserError(format!(
"Cannot rebase {} onto descendant {}",
short_commit_hash(old_commit.id()),