Skip to content

Commit

Permalink
Merge pull request gitbutlerapp#4054 from gitbutlerapp/diff-the-corre…
Browse files Browse the repository at this point in the history
…ct-way-round

Diff the correct way round
  • Loading branch information
Caleb-T-Owens committed Jun 10, 2024
2 parents 848fabd + a4f548e commit 63036a8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crates/gitbutler-core/src/virtual_branches/virtual.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,7 @@ fn new_compute_locks(
let commit = repository.find_commit(branch.head).ok()?;
let tree = commit.tree().ok()?;
let diff = repository
.diff_tree_to_tree(Some(&tree), Some(&target_tree), Some(opts))
.diff_tree_to_tree(Some(&target_tree), Some(&tree), Some(opts))
.ok()?;
let hunks_by_filepath = diff::hunks_by_filepath(Some(repository), &diff).ok()?;

Expand Down

0 comments on commit 63036a8

Please sign in to comment.