Skip to content

Commit 339a6c1

Browse files
committed
adapt to changes in gix related rename tracking
1 parent b7e1f38 commit 339a6c1

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use std::{
77
use anyhow::{anyhow, bail};
88
use gix::{
99
bstr::{BStr, BString, ByteSlice},
10+
diff::rewrites::CopySource,
1011
features::progress,
11-
object::tree::diff::rewrites::CopySource,
1212
odb::FindExt,
1313
parallel::{InOrderIter, SequenceId},
1414
prelude::ObjectIdExt,
@@ -138,11 +138,10 @@ pub fn update(
138138
});
139139

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

0 commit comments

Comments
 (0)