Merge pull request #70 from wcampbell0x2a/force-checkout

rel: 0.8.1; Force checkout head for Fast-Forward
wcampbell0x2a · May 30, 2024 · 4637f71 · 4637f71
2 parents bfe63df + fcdac6d
commit 4637f71
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.1] - 05-30-2024
+- Force checkout when using Fast-Forward when updating git `crates.io-index`
+
 ## [0.8.0] - 05-29-2024
 - Properly set local HEAD to fetched git repo `crates.io-index` when updating from previous zerus invocation
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zerus"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 authors = ["wcampbell"]
 description = "Lightweight binary to download only project required crates for offline crates.io mirror"

diff --git a/src/git.rs b/src/git.rs
@@ -232,6 +232,6 @@ fn fast_forward(
     println!("{}", msg);
     lb.set_target(rc.id(), &msg)?;
     repo.set_head(&name)?;
-    repo.checkout_head(None)?;
+    repo.checkout_head(Some(git2::build::CheckoutBuilder::default().force()))?;
     Ok(())
 }