mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-20 11:25:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

rewrite: leverage root_id() helper on commit object

Browse source
This commit is contained in:
Martin von Zweigbergk 2024-03-25 23:23:59 -07:00 committed by Martin von Zweigbergk
parent 0ef25bb4b6
commit f696f5b727
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/rewrite.rs
View file

@ -148,11 +148,11 @@ pub fn rebase_commit_with_options(
let old_parents = old_commit.parents();
let old_parent_trees = old_parents
.iter()
.map(|parent| parent.store_commit().root_tree.clone())
.map(|parent| parent.tree_id().clone())
.collect_vec();
let new_parent_trees = new_parents
.iter()
.map(|parent| parent.store_commit().root_tree.clone())
.map(|parent| parent.tree_id().clone())
.collect_vec();
let (old_base_tree_id, new_tree_id) = if new_parent_trees == old_parent_trees {