diff --git a/gitoxide-core/src/query/engine/update.rs b/gitoxide-core/src/query/engine/update.rs index bae1a6d3daa..b791b69f1be 100644 --- a/gitoxide-core/src/query/engine/update.rs +++ b/gitoxide-core/src/query/engine/update.rs @@ -7,8 +7,8 @@ use std::{ use anyhow::{anyhow, bail}; use gix::{ bstr::{BStr, BString, ByteSlice}, + diff::rewrites::CopySource, features::progress, - object::tree::diff::rewrites::CopySource, odb::FindExt, parallel::{InOrderIter, SequenceId}, prelude::ObjectIdExt, @@ -138,11 +138,10 @@ pub fn update( }); let rewrites = { - let mut r = - gix::object::tree::diff::Rewrites::try_from_config(&repo.config_snapshot(), true)?.unwrap_or_default(); - r.copies = Some(gix::object::tree::diff::rewrites::Copies { + let mut r = gix::diff::Rewrites::try_from_config(&repo.config_snapshot(), true)?.unwrap_or_default(); + r.copies = Some(gix::diff::rewrites::Copies { source: if find_copies_harder { - CopySource::FromSetOfModifiedFilesAndSourceTree + CopySource::FromSetOfModifiedFilesAndAllSources } else { CopySource::FromSetOfModifiedFiles },