Skip to content

Commit b4b3966

Browse files
committed
fix: tree() diffing now also recognizes merge mode changes as modification.
1 parent 39f46c5 commit b4b3966

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

gix-diff/src/tree/function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ fn handle_lhs_and_rhs_with_equal_filenames(
377377
(false, false) => {
378378
delegate.push_path_component(lhs.filename);
379379
debug_assert!(lhs.mode.is_no_tree() && lhs.mode.is_no_tree());
380-
if lhs.oid != rhs.oid
380+
if (lhs.oid != rhs.oid || lhs.mode != rhs.mode)
381381
&& delegate
382382
.visit(Change::Modification {
383383
previous_entry_mode: lhs.mode,

0 commit comments

Comments
 (0)