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

working_copy: remove matching that's always against _

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-07-06 04:48:17 -07:00 committed by Martin von Zweigbergk
parent 868188c84e
commit 8af22eb83c
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/src/working_copy.rs
View file

@ -928,23 +928,19 @@ impl TreeState {
file_state.mark_executable(executable); file_state.mark_executable(executable);
stats.updated_files += 1; stats.updated_files += 1;
} }
Diff::Modified(before, after) => { Diff::Modified(_before, after) => {
fs::remove_file(&disk_path).ok(); fs::remove_file(&disk_path).ok();
let file_state = match (before, after) { let file_state = match after {
(_, TreeValue::File { id, executable }) => { TreeValue::File { id, executable } => {
self.write_file(&disk_path, &path, &id, executable)? self.write_file(&disk_path, &path, &id, executable)?
} }
(_, TreeValue::Symlink(id)) => { TreeValue::Symlink(id) => self.write_symlink(&disk_path, &path, &id)?,
self.write_symlink(&disk_path, &path, &id)? TreeValue::Conflict(id) => self.write_conflict(&disk_path, &path, &id)?,
} TreeValue::GitSubmodule(_id) => {
(_, TreeValue::Conflict(id)) => {
self.write_conflict(&disk_path, &path, &id)?
}
(_, TreeValue::GitSubmodule(_id)) => {
println!("ignoring git submodule at {path:?}"); println!("ignoring git submodule at {path:?}");
FileState::for_gitsubmodule() FileState::for_gitsubmodule()
} }
(_, TreeValue::Tree(_id)) => { TreeValue::Tree(_id) => {
panic!("unexpected tree entry in diff at {path:?}"); panic!("unexpected tree entry in diff at {path:?}");
} }
}; };