Merge branch 'develop'

Cargo.lock

@@ -332,7 +332,7 @@ dependencies = [
 
 [[package]]
 name = "git-repo-manager"
-version = "0.7.4"
+version = "0.7.5"
 dependencies = [
  "clap",
  "comfy-table",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "git-repo-manager"
-version = "0.7.4"
+version = "0.7.5"
 edition = "2021"
 
 authors = [

Justfile

@@ -80,3 +80,6 @@ update-cargo-dependencies:
     && . ./venv/bin/activate \
     && pip --disable-pip-version-check install -r ./requirements.txt > /dev/null \
     && ./update-cargo-dependencies.py
+
+wait:
+    read -p "[ENTER] to continue "

docs/src/releases.md

@@ -5,7 +5,7 @@ remotes and then run `./release (major|minor|patch)`. It will handle a
 git-flow-y release, meaning that it will perform a merge from `develop` to
 `master`, create a git tag, sync all remotes and run `cargo publish`.
 
-The release script will also run `just check` to make sure that nothing it
+Make sure to run `just check` before releasing to make sure that nothing is
 broken.
 
 As GRM is still `v0.x`, there is not much consideration for backwards
@@ -17,7 +17,7 @@ dependencies](./dependency_updates.md). As `./release.sh patch` is exposed as a
 Justfile target (`release-patch`), it's possible to do both in one step:
 
 ```bash
-$ just update-dependencies release-patch
+$ just update-dependencies check release-patch
 ```
 
 ## Release notes

release.sh

@@ -94,8 +94,6 @@ if ((changes == 0)); then
     exit 1
 fi
 
-just check
-
 sed -i "0,/^version/{s/^version.*$/version = \"${new_version}\"/}" Cargo.toml
 
 cargo update --package git-repo-manager --precise "${new_version}"

src/repo.rs

@@ -1280,7 +1280,7 @@ impl RepoHandle {
                     .next()
                     .is_none()
                 {
-                    if let Err(e) = std::fs::remove_dir_all(&current_dir) {
+                    if let Err(e) = std::fs::remove_dir(&current_dir) {
                         return Err(WorktreeRemoveFailureReason::Error(format!(
                             "Error deleting {}: {}",
                             &worktree_dir.display(),