From f95a52df4aa885a7e1901e2d5c6d0b5e6be01866 Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Wed, 3 Sep 2025 12:33:47 -0400 Subject: [PATCH] fix(xtask): reset fixtures when checking out new version --- crates/xtask/src/fetch.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/crates/xtask/src/fetch.rs b/crates/xtask/src/fetch.rs index b37b510a..6fa431c6 100644 --- a/crates/xtask/src/fetch.rs +++ b/crates/xtask/src/fetch.rs @@ -59,6 +59,15 @@ pub fn run_fixtures(args: &FetchFixtures) -> Result<()> { &format!("Failed to fetch tag {tag} for {grammar} grammar"), )?; + let mut reset_command = Command::new("git"); + reset_command + .current_dir(&grammar_dir) + .args(["reset", "--hard", "HEAD"]); + bail_on_err( + &reset_command.spawn()?.wait_with_output()?, + &format!("Failed to reset {grammar} grammar working tree"), + )?; + let mut checkout_command = Command::new("git"); checkout_command .current_dir(&grammar_dir)