Merge branch 'main' into gix-url-parse-rewrite

Author: niklaswimmer

.cargo/config.toml

@@ -5,7 +5,6 @@ rustflags = [
 
     # Clippy lints
     "-W", "clippy::cloned_instead_of_copied",
-    "-W", "clippy::explicit_iter_loop",
     "-W", "clippy::map_unwrap_or",
     "-W", "clippy::redundant_closure_for_method_calls",
     "-W", "clippy::unnested_or_patterns",
@@ -14,6 +13,7 @@ rustflags = [
     # Rejected for now, and why
     # "-W" "clippy::default_trait_access" - sometimes makes imports necessary, just for a default value. It's good for more explicit typing though.
     # "-W" "clippy::range_plus_one" - useful, but caused too many false positives as we use range types directly quite a lot
+    # "-W", "clippy::explicit_iter_loop", - the cases I saw turned `foo.iter_mut()` into `&mut *foo`
 
 
     # Rustdoc lints

.github/workflows/ci.yml

@@ -1,5 +1,9 @@
 name: ci
 
+env:
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 on:
   push:
     branches: [ main ]
@@ -106,7 +110,7 @@ jobs:
   installation:
     strategy:
       matrix:
-        build: [ win-msvc, win-gnu, win32-msvc ]
+        build: [ win-msvc, win-gnu, win32-msvc, win32-gnu ]
         include:
           - build: win-msvc
             os: windows-latest
@@ -120,6 +124,10 @@ jobs:
             os: windows-latest
             rust: stable
             target: i686-pc-windows-msvc
+          - build: win32-gnu
+            os: windows-latest
+            rust: stable
+            target: i686-pc-windows-gnu
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -129,12 +137,16 @@ jobs:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
       - uses: Swatinem/rust-cache@v2
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW${{ startsWith(matrix.target, 'i686-') && '32' || '64' }}
+          pacboy: cc:p
+          path-type: inherit
       - name: "Install prerequisites"
         run: vcpkg install  zlib:x64-windows-static-md
       - name: "Installation from crates.io: gitoxide"
         run: cargo +${{ matrix.rust }} install --target ${{ matrix.target }} --target-dir install-artifacts --debug --force gitoxide
-      - name: "Installation from crates.io: cargo-smart-release"
-        run: cargo +${{ matrix.rust }} install --target ${{ matrix.target }} --target-dir install-artifacts --debug --force cargo-smart-release
+        shell: msys2 {0}
 
   lint:
     runs-on: ubuntu-latest

.github/workflows/msrv.yml

@@ -20,6 +20,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/[email protected] # dictated by `windows` crates effectively, IMPORTANT: adjust etc/msrv-badge.svg as well
+      - uses: dtolnay/[email protected] # dictated by `firefox` to support the `helix` editor, IMPORTANT: adjust etc/msrv-badge.svg as well
       - uses: extractions/setup-just@v1
       - run: just ci-check-msrv

.github/workflows/release.yml

@@ -12,6 +12,11 @@
 
 name: release
 
+env:
+  RUST_BACKTRACE: 1
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 on:
   workflow_dispatch:
   push:
@@ -77,7 +82,6 @@ jobs:
       EXE_NAME: ein
     strategy:
       matrix:
-#         build: [ linux, linux-arm, macos, win-msvc, win-gnu, win32-msvc ]
         build: [ linux, linux-arm, macos, win-msvc, win-gnu, win32-msvc ]
         feature: [ "small", "lean", "max", "max-pure" ]
         include:

CHANGELOG.md

@@ -5,7 +5,125 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## 0.30.0 (2023-09-24)
+
+<csr-id-d3ac691446c9d029eb4f04d111887fa06720939d/>
+<csr-id-ed327f6163f54756e58c20f86a563a97efb256ca/>
+
+This release contains a security fix which assure URLs like `'ssh://-oProxyCommand=open$IFS-aCalculator/foo'` will not execute attacker-controlled
+strings. The above can, on MacOS, launch the calculator app when using it with `gix clone` for example, up to v0.29.0.
+
+### New Features
+
+ - <csr-id-f094f71dc1a50955552509d108556c01517c6ed6/> `gix status` with basic index-worktree comparison
+ - <csr-id-3ff5ac0cda9e3e089dc79fdfbff5ff619ee60b1f/> `gix free index from-list` and `gix index from-tree` gain `--skip-hash`.
+   This flag can be derived from options, but thus far we have no higher-level
+   writing of the index so this has to do to see the difference in performance.
+
+### Refactor
+
+ - <csr-id-d3ac691446c9d029eb4f04d111887fa06720939d/> both `ein` and `gix` now share some code via the `gitoxide` library.
+   This can slightly improve compile times as well, even though it wasn't measured.
+
+### Chore (BREAKING)
+
+ - <csr-id-ed327f6163f54756e58c20f86a563a97efb256ca/> update to the latest `prodash`
+   It makes proper usage of `Progress` types easier and allows them to be used
+   as `dyn` traits as well.
+
+### Bug Fixes (BREAKING)
+
+ - <csr-id-072ee32f693a31161cd6a843da6582d13efbb20b/> use `dyn` trait where possible.
+   This reduces compile time due to avoiding duplication.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 13 commits contributed to the release over the course of 27 calendar days.
+ - 33 days passed between releases.
+ - 5 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 2 unique issues were worked on: [#987](https://github.com/Byron/gitoxide/issues/987), [#992](https://github.com/Byron/gitoxide/issues/992)
+
+### Thanks Clippy
+
+<csr-read-only-do-not-edit/>
+
+[Clippy](https://github.com/rust-lang/rust-clippy) helped 1 time to make code idiomatic. 
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **[#987](https://github.com/Byron/gitoxide/issues/987)**
+    - Use a multi-call binary ('uni') to have only one build step ([`4ef9a32`](https://github.com/Byron/gitoxide/commit/4ef9a32307a5e91868161a5f683b6b97ad9ebbdd))
+ * **[#992](https://github.com/Byron/gitoxide/issues/992)**
+    - Both `ein` and `gix` now share some code via the `gitoxide` library. ([`d3ac691`](https://github.com/Byron/gitoxide/commit/d3ac691446c9d029eb4f04d111887fa06720939d))
+ * **Uncategorized**
+    - Merge branch 'reset' ([`54a8495`](https://github.com/Byron/gitoxide/commit/54a849545140f7f1c0c7564c418071c0a76a34e7))
+    - `gix status` with basic index-worktree comparison ([`f094f71`](https://github.com/Byron/gitoxide/commit/f094f71dc1a50955552509d108556c01517c6ed6))
+    - Merge branch `dyn`ification ([`f658fcc`](https://github.com/Byron/gitoxide/commit/f658fcc52dc2200ae34ca53dc10be97fb9012057))
+    - Use `dyn` trait where possible. ([`072ee32`](https://github.com/Byron/gitoxide/commit/072ee32f693a31161cd6a843da6582d13efbb20b))
+    - Update to the latest `prodash` ([`ed327f6`](https://github.com/Byron/gitoxide/commit/ed327f6163f54756e58c20f86a563a97efb256ca))
+    - Merge branch 'adjustments-for-cargo' ([`b7560a2`](https://github.com/Byron/gitoxide/commit/b7560a2445b62f888bf5aa2ba4c5a47ae037cb23))
+    - Merge branch 'fixes' ([`4bfd1cc`](https://github.com/Byron/gitoxide/commit/4bfd1cc8f7922a8c4de6b9d078d54b93e78f51ff))
+    - Thanks clippy ([`0d6d4ec`](https://github.com/Byron/gitoxide/commit/0d6d4ec8030d2e8f4c7a9d6f421d54776c4b67fb))
+    - Adapt to changes in `gix-index` and pass skip-hash through for performance.. ([`713cd59`](https://github.com/Byron/gitoxide/commit/713cd59f0b1eff6397b80f1e1fceec278532fd59))
+    - `gix free index from-list` and `gix index from-tree` gain `--skip-hash`. ([`3ff5ac0`](https://github.com/Byron/gitoxide/commit/3ff5ac0cda9e3e089dc79fdfbff5ff619ee60b1f))
+    - Add more configuration variables prior to potentially using them; remove `index.skipHash` ([`773b6e3`](https://github.com/Byron/gitoxide/commit/773b6e3d5b69f819805fc77e963ec2a059bf40be))
+</details>
+
+## 0.29.0 (2023-08-22)
+
+### New Features
+
+ - <csr-id-1ccbe16117d58b68b25a8e3e66676a61a07dd49c/> `gix submodule` subcommand for simple submodule listing and information retrieval
+ - <csr-id-6bc69e37deb3ebd88af8b0e8ffb9661562dcc679/> `gix index entries --recurse-subomdules` to also list submodules.
+ - <csr-id-c30ac0c9f89fb4480c8f8c8c0c06fa046dcd4314/> `gix index entries` with styles and pathspecs.
+   This adds support for more simple git style, which is faster and thus
+   allows for more direct comparisons to `git ls-files`.
+ - <csr-id-f194cfc920cc8622215bab5aa6b7b87e4fb9d7b2/> use real pathspecs where it was supported before.
+ - <csr-id-cd6cfe4049bacd8d8a691668b5501a673867f149/> add `gix commit verify-signature` to do something akin to `git ... --show-signature`.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 20 commits contributed to the release over the course of 15 calendar days.
+ - 30 days passed between releases.
+ - 5 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Merge branch 'gix-submodule' ([`8f3f358`](https://github.com/Byron/gitoxide/commit/8f3f358800f1fe77d7ba7ebd396a90b692d3c0c1))
+    - `gix submodule` subcommand for simple submodule listing and information retrieval ([`1ccbe16`](https://github.com/Byron/gitoxide/commit/1ccbe16117d58b68b25a8e3e66676a61a07dd49c))
+    - Just fmt ([`0d258f4`](https://github.com/Byron/gitoxide/commit/0d258f40afcd848509e2b0c7c264e9f346ed1726))
+    - Merge branch 'submodule-in-gix' ([`36f7b78`](https://github.com/Byron/gitoxide/commit/36f7b783c67b8a087076a130f5ee9b90b23bc3cc))
+    - `gix index entries --recurse-subomdules` to also list submodules. ([`6bc69e3`](https://github.com/Byron/gitoxide/commit/6bc69e37deb3ebd88af8b0e8ffb9661562dcc679))
+    - Merge branch 'submodule-active' ([`a3afaa4`](https://github.com/Byron/gitoxide/commit/a3afaa42741616a0f1abeef9b54557e7c2b800cb))
+    - Adapt to changes in `gix` ([`ca972a2`](https://github.com/Byron/gitoxide/commit/ca972a244c9b074a2dc89ff3bbf83df0c3853904))
+    - Use `Defaults::from_environment()` when parsing pathspecs. ([`2a99034`](https://github.com/Byron/gitoxide/commit/2a99034bf451b1a801650b80705c96ce4c9e61c1))
+    - Optimize startup times of `gix index entries` ([`22477bd`](https://github.com/Byron/gitoxide/commit/22477bdcf37419627dbb7afe0df166935825ad2b))
+    - Merge branch 'pathspec-matching' ([`9f4dfe0`](https://github.com/Byron/gitoxide/commit/9f4dfe0f0b948280692916b596923959ea2fd9da))
+    - `gix index entries` with styles and pathspecs. ([`c30ac0c`](https://github.com/Byron/gitoxide/commit/c30ac0c9f89fb4480c8f8c8c0c06fa046dcd4314))
+    - Use real pathspecs where it was supported before. ([`f194cfc`](https://github.com/Byron/gitoxide/commit/f194cfc920cc8622215bab5aa6b7b87e4fb9d7b2))
+    - Merge branch 'handlers-mt' ([`f584d76`](https://github.com/Byron/gitoxide/commit/f584d7698d93836daef2000fd369034de46037f0))
+    - Adapt to changes in `gix` ([`a201f0d`](https://github.com/Byron/gitoxide/commit/a201f0d45936826ef26ac815acb9d2efbb3d5c68))
+    - Merge branch 'extract-signatures' ([`b37affe`](https://github.com/Byron/gitoxide/commit/b37affefecfb30a94431cd21dae6659004ca6244))
+    - Add `gix commit verify-signature` to do something akin to `git ... --show-signature`. ([`cd6cfe4`](https://github.com/Byron/gitoxide/commit/cd6cfe4049bacd8d8a691668b5501a673867f149))
+    - Merge branch 'archive-gz' ([`c7d9129`](https://github.com/Byron/gitoxide/commit/c7d912917a2dad5c076d0bd645cfda092c66ff79))
+    - Adapt to changes in `gix-archive` ([`feba76d`](https://github.com/Byron/gitoxide/commit/feba76d636e3d177c41f120639980f8b46edfcaa))
+    - Merge branch 'submodules' ([`b629f8a`](https://github.com/Byron/gitoxide/commit/b629f8a774931d58c0a9b124fa75f85807c6c5d1))
+    - `.gitmodule` file abstraction ([`6a2e6a4`](https://github.com/Byron/gitoxide/commit/6a2e6a436f76c8bbf2487f9967413a51356667a0))
+</details>
 
 ## 0.28.0 (2023-07-22)