diff --git a/lib/src/working_copy.rs b/lib/src/working_copy.rs index bb77bcec4..828ef5b3a 100644 --- a/lib/src/working_copy.rs +++ b/lib/src/working_copy.rs @@ -582,17 +582,7 @@ impl TreeState { } fn current_tree(&self) -> Result { - match &self.tree_id { - MergedTreeId::Legacy(tree_id) => { - let current_tree = self.store.get_tree(&RepoPath::root(), tree_id)?; - Ok(MergedTree::legacy(current_tree)) - } - MergedTreeId::Merge(tree_ids) => { - let tree_merge = - tree_ids.try_map(|tree_id| self.store.get_tree(&RepoPath::root(), tree_id))?; - Ok(MergedTree::new(tree_merge)) - } - } + self.store.get_root_tree(&self.tree_id) } fn write_file_to_store(