mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-05 19:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge_tools: use right_file_mode in make_diff_files

Browse source 
See the issue #2548 for more context.
This commit is contained in:
Łukasz Kurowski 2023-11-11 18:21:16 +01:00 committed by Łukasz Kurowski
parent e4955d29f3
commit ffd688472e
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cli/src/merge_tools/builtin.rs
View file

@ -350,7 +350,7 @@ pub fn make_diff_files(
files.push(scm_record::File { files.push(scm_record::File {
old_path: None, old_path: None,
path: Cow::Owned(changed_path.to_fs_path(Path::new(""))), path: Cow::Owned(changed_path.to_fs_path(Path::new(""))),
file_mode: None, file_mode: Some(right_file_mode),
sections, sections,
}); });
} }
@ -587,7 +587,11 @@ mod tests {
File { File {
old_path: None, old_path: None,
path: "unchanged", path: "unchanged",
file_mode: None, file_mode: Some(
FileMode(
33188,
),
),
sections: [ sections: [
Unchanged { Unchanged {
lines: [ lines: [
@ -599,7 +603,11 @@ mod tests {
File { File {
old_path: None, old_path: None,
path: "changed", path: "changed",
file_mode: None, file_mode: Some(
FileMode(
33188,
),
),
sections: [ sections: [
Unchanged { Unchanged {
lines: [ lines: [
@ -644,7 +652,11 @@ mod tests {
File { File {
old_path: None, old_path: None,
path: "added", path: "added",
file_mode: None, file_mode: Some(
FileMode(
33188,
),
),
sections: [ sections: [
Changed { Changed {
lines: [ lines: [