Skip to content

Commit a28bf90

Browse files
committed
adapt to changes in gix related rename tracking
1 parent 089c4dc commit a28bf90

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

gitoxide-core/src/query/engine/update.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use anyhow::{anyhow, bail};
99
use gix::objs::find::Error;
1010
use gix::{
1111
bstr::{BStr, BString, ByteSlice},
12+
diff::rewrites::CopySource,
1213
features::progress,
13-
object::tree::diff::rewrites::CopySource,
1414
parallel::{InOrderIter, SequenceId},
1515
prelude::ObjectIdExt,
1616
Count, Progress,
@@ -139,11 +139,10 @@ pub fn update(
139139
});
140140

141141
let rewrites = {
142-
let mut r =
143-
gix::object::tree::diff::Rewrites::try_from_config(&repo.config_snapshot(), true)?.unwrap_or_default();
144-
r.copies = Some(gix::object::tree::diff::rewrites::Copies {
142+
let mut r = gix::diff::new_rewrites(&repo.config_snapshot(), true)?.unwrap_or_default();
143+
r.copies = Some(gix::diff::rewrites::Copies {
145144
source: if find_copies_harder {
146-
CopySource::FromSetOfModifiedFilesAndSourceTree
145+
CopySource::FromSetOfModifiedFilesAndAllSources
147146
} else {
148147
CopySource::FromSetOfModifiedFiles
149148
},

0 commit comments

Comments
 (0)