ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

working_copy: avoid an unused variable on Windows

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-08-10 16:21:58 -07:00 committed by Martin von Zweigbergk
parent fb41ef4fa0
commit abc7312dbc
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/src/working_copy.rs
View file

@ -999,7 +999,7 @@ impl TreeState {
let executable = *executable;
#[cfg(windows)]
let executable = {
let _ = executable;
let () = executable; // use the variable
false
};
self.write_conflict_to_store(repo_path, disk_path, conflict_id.clone(), executable)
@ -1009,11 +1009,13 @@ impl TreeState {
let id = self.write_file_to_store(repo_path, disk_path)?;
// On Windows, we preserve the executable bit from the current tree.
#[cfg(windows)]
let executable =
let executable = {
let () = executable; // use the variable
if let Some(TreeValue::File { id: _, executable }) = current_tree_value {
executable
} else {
false
}
};
Ok(TreeValue::File { id, executable })
}