Skip to content

Commit

Permalink
adapt to changes in gix related rename tracking
Browse files Browse the repository at this point in the history
  • Loading branch information
Byron committed Nov 1, 2023
1 parent bf69222 commit 539a295
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions gitoxide-core/src/query/engine/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
},
Expand Down

0 comments on commit 539a295

Please sign in to comment.