From 33a93b6d2d0d1f9f0b5fea908bde1564be3f38d9 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Fri, 11 Aug 2023 21:52:17 -0700 Subject: [PATCH] working_copy: reduce scope of a `content` variable This also avoids reading non-file conflict from disk. --- lib/src/working_copy.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src/working_copy.rs b/lib/src/working_copy.rs index 65bef44ba..d0b13b5b9 100644 --- a/lib/src/working_copy.rs +++ b/lib/src/working_copy.rs @@ -966,14 +966,14 @@ impl TreeState { if let (Some(TreeValue::Conflict(conflict_id)), FileType::Normal { executable }) = (¤t_tree_value, &file_type) { - let mut file = File::open(disk_path).map_err(|err| SnapshotError::IoError { - message: format!("Failed to open file {}", disk_path.display()), - err, - })?; - let mut content = vec![]; - file.read_to_end(&mut content).unwrap(); let conflict = self.store.read_conflict(repo_path, conflict_id)?; if let Some(old_file_ids) = conflict.to_file_merge() { + let mut file = File::open(disk_path).map_err(|err| SnapshotError::IoError { + message: format!("Failed to open file {}", disk_path.display()), + err, + })?; + let mut content = vec![]; + file.read_to_end(&mut content).unwrap(); let new_file_ids = conflicts::update_from_content( &old_file_ids, self.store.as_ref(),