From b8d8b739c6bd850e4ad03a408d80e977504f9b8f Mon Sep 17 00:00:00 2001
From: Anthony Eid <anthony@zed.dev>
Date: Mon, 6 Apr 2026 15:43:29 -0400
Subject: [PATCH] Support HEAD^ in fake repo reset implementation

---
 crates/fs/src/fake_git_repo.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
index 4369c2c903cb85510b65ecadbe0d3c54703e18b9..419bf1c682b82f5509a20c91d55b04a8248ffd20 100644
--- a/crates/fs/src/fake_git_repo.rs
+++ b/crates/fs/src/fake_git_repo.rs
@@ -231,7 +231,7 @@ impl GitRepository for FakeGitRepository {
         _env: Arc<HashMap<String, String>>,
     ) -> BoxFuture<'_, Result<()>> {
         self.with_state_async(true, move |state| {
-            let pop_count = if commit == "HEAD~" {
+            let pop_count = if commit == "HEAD~" || commit == "HEAD^" {
                 1
             } else if let Some(suffix) = commit.strip_prefix("HEAD~") {
                 suffix