cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 15:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

local_working_copy: avoid a block_on() in already async function

Browse Source
This commit is contained in:
Martin von Zweigbergk 2025-04-25 07:52:29 -07:00
parent a3dcd8b659
commit 13477940af
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/local_working_copy.rs
View File

@ -1523,7 +1523,7 @@ impl FileSnapshotter<'_> {
data.conflict_marker_len as usize data.conflict_marker_len as usize
}), }),
) )
.block_on()?; .await?;
match new_file_ids.into_resolved() { match new_file_ids.into_resolved() {
Ok(file_id) => { Ok(file_id) => {
// On Windows, we preserve the executable bit from the merged trees. // On Windows, we preserve the executable bit from the merged trees.