From 13477940af42a74a58caaaaeafdbd322cfebb81d Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Fri, 25 Apr 2025 07:52:29 -0700
Subject: [PATCH] local_working_copy: avoid a `block_on()` in already async
 function

---
 lib/src/local_working_copy.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/local_working_copy.rs b/lib/src/local_working_copy.rs
index 10ae13317..cd6ce7b7f 100644
--- a/lib/src/local_working_copy.rs
+++ b/lib/src/local_working_copy.rs
@@ -1523,7 +1523,7 @@ impl FileSnapshotter<'_> {
                     data.conflict_marker_len as usize
                 }),
             )
-            .block_on()?;
+            .await?;
             match new_file_ids.into_resolved() {
                 Ok(file_id) => {
                     // On Windows, we preserve the executable bit from the merged trees.