Merge branch 'main' into fix-1183

Author: Byron

Diff for: .gitattributes

@@ -1,4 +1,4 @@
-**/generated-archives/*.tar.xz filter=lfs diff=lfs merge=lfs -text
+**/generated-archives/*.tar.xz filter=lfs-disabled diff=lfs merge=lfs -text
 
 # assure line feeds don't interfere with our working copy hash 
 **/tests/fixtures/**/*.sh text crlf=input	eol=lf

Diff for: .github/workflows/ci.yml

@@ -79,7 +79,9 @@ jobs:
       - name: "cargo check default features"
         if: startsWith(matrix.os, 'windows')
         run: cargo check --all --bins --examples
-      - run: git lfs fetch && git lfs checkout
+      - run: |
+          # it should never be a failure not to get the caches, as they can be regenerated.
+          git lfs fetch && git lfs checkout || true
       - uses: taiki-e/install-action@v1
         with:
           tool: nextest
@@ -89,8 +91,9 @@ jobs:
 
   test-32bit:
     runs-on: ubuntu-latest
-    env:
-      TARGET: i686-unknown-linux-gnu
+    strategy:
+      matrix:
+        target: [ i686-unknown-linux-gnu, armv7-linux-androideabi ]
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
@@ -99,14 +102,16 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          targets: ${{ env.TARGET }}
+          targets: ${{ matrix.target }}
       - uses: taiki-e/install-action@v1
         with:
           tool: cross
+      - name: "check"
+        run: cross check -p gix --target ${{ matrix.target }}
       - name: "Test (unit)"
         # run high-level unit tests that exercise a lot of code while being pure Rust to ease building test binaries.
         # TODO: figure out why `git` doesn't pick up environment configuration so build scripts fail when using `-p gix`.
-        run: cross test -p gix-hashtable --target ${{ env.TARGET }}
+        run: cross test -p gix-hashtable --target ${{ matrix.target }}
 
   installation:
     strategy:

Diff for: CHANGELOG.md

@@ -9,31 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### New Features
 
+<csr-id-4aea9b097fb08e504cdfc4a7c3b7511a308dc074/>
+<csr-id-c6e83cf69f1a17e9ba3010bcce3a4ddd3305424c/>
+<csr-id-8f795e8abf706a24fe104500bf15efaa2bc07b15/>
+<csr-id-8dfbb4ba531d86894a59e2b85ec29cd3133c8c4d/>
+<csr-id-f9ae1bc6b514b6bbcda2c672f7b7ccbd999356a0/>
+<csr-id-886289f98003f935d774a40f6db746ae70649936/>
+
  - <csr-id-cf51a4de2d06eb28435ef8e386131710003b6928/> `gix rev parse --format` to provide different versions of the same content.
    This only applies to blobs, but allows to obtain different versions of the same blob
    like:
 
    * what's stored in Git
-   * what would be checked out to the worktree
-   * what would be diffed
- - <csr-id-4aea9b097fb08e504cdfc4a7c3b7511a308dc074/> add the`diff::resource_cache()` low-level utility for rapid in-memory diffing of combinations of resources.
-   We also add the `object::tree::diff::Platform::for_each_to_obtain_tree_with_cache()` to pass a resource-cache
-   for re-use between multiple invocation for significant savings.
- - <csr-id-c6e83cf69f1a17e9ba3010bcce3a4ddd3305424c/> In gix read http.sslVerify config value and pass it to gix-transport.
- - <csr-id-8f795e8abf706a24fe104500bf15efaa2bc07b15/> add basic connectivity check
-   Implement a simple connectivity check in a new `gix-fsck` crate, and add
-   this to `gix` via a new `fsck` subcommand. Currently this is
-   functionally equivalent to:
-   `git rev-list --objects --quiet --missing=print`
- - <csr-id-8dfbb4ba531d86894a59e2b85ec29cd3133c8c4d/> Allow to print a tree without prettification, using `--tree-style raw`.
-   This is mainly useful to generate fixtures for the test-suite, and is assured
-   to not add extra-bytes to the output either.
- - <csr-id-f9ae1bc6b514b6bbcda2c672f7b7ccbd999356a0/> automatically enforce strict mode if `-c` options are given on the command-line.
-   This should stop most mistakes right away, instead of possibly silently
-   ignoring them depending on what was hard-coded in the respective sub-command.
- - <csr-id-886289f98003f935d774a40f6db746ae70649936/> add `gix free discover` to inform about repository discovery.
-   It's mainly to better understand what's causing certain failures
-   if a repository can't be opened, in different modes of operations.
+* what would be checked out to the worktree
+* what would be diffed
 
 ### Bug Fixes