Skip to content

Commit 9896d5d

Browse files
committed
adapt to changes in gix
1 parent bd905a6 commit 9896d5d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,12 @@ pub fn update(
139139
});
140140

141141
let rewrites = {
142-
let mut r = gix::diff::new_rewrites(&repo.config_snapshot(), true)?.unwrap_or_default();
142+
// These are either configured, or we set them to the default. There is no turning them off.
143+
let (r, was_configured) = gix::diff::new_rewrites(&repo.config_snapshot(), true)?;
144+
if was_configured && r.is_none() {
145+
gix::trace::warn!("Rename tracking is disabled by configuration, but we enable it using the default");
146+
}
147+
let mut r = r.unwrap_or_default();
143148
r.copies = Some(gix::diff::rewrites::Copies {
144149
source: if find_copies_harder {
145150
CopySource::FromSetOfModifiedFilesAndAllSources

0 commit comments

Comments
 (0)