Merge pull request #70 from wcampbell0x2a/force-checkout

wcampbell0x2a · web-flow · commit 4637f712cce6 · 2024-05-30T17:25:42.000-04:00
rel: 0.8.1; Force checkout head for Fast-Forward
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(())
 }

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,6 @@ fn fast_forward(`
`232`	`232`	`println!("{}", msg);`
`233`	`233`	`lb.set_target(rc.id(), &msg)?;`
`234`	`234`	`repo.set_head(&name)?;`
`235`		`- repo.checkout_head(None)?;`
	`235`	`+ repo.checkout_head(Some(git2::build::CheckoutBuilder::default().force()))?;`
`236`	`236`	`Ok(())`
`237`	`237`	`}`