From 8cb3a3553fbd0a2fcd40fd4e7bb57f3bcdb34ce1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jan 2025 11:11:42 +0000
Subject: [PATCH] Bump gix from 0.68.0 to 0.69.1 (#1859)

Bumps [gix](https://github.com/GitoxideLabs/gitoxide) from 0.68.0 to
0.69.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/GitoxideLabs/gitoxide/releases">gix's
releases</a>.</em></p>
<blockquote>
<h2>gix v0.69.0</h2>
<h3>Changed</h3>
<ul>
<li>
<p>Adjust gix::dirwalk::Options::{X,set_X} parameter names
This adjusts the names of parameters to <code>X</code> and
<code>set_X</code> methods of
<code>gix::dirwalk::Options</code> (where <code>X</code> is an option
name) to use a
systematic naming convention:</p>
<ul>
<li>For the same option <code>X</code>, the <code>X</code> and
<code>set_X</code> methods now always
have the same name of the parameter that specifies a value for an
option.</li>
</ul>
</li>
</ul>
<h3>New Features</h3>
<ul>
<li>handle RefLogLookup::Date</li>
<li>add <code>merge::tree::TreeFavor</code> similar to
<code>*::FileFavor</code>.
That way it's possible to control how tree-conflicts should be
auto-resolved.</li>
</ul>
<h3>Bug Fixes</h3>
<ul>
<li>assure date-tests won't fail over time.
Need to use absolute timestamps as it's impossible to control the system
time.</li>
<li>public access to the contained repository in wrapped types, like
<code>Id</code>.
This makes these types easier to use as it's enough to pass a wrapped
type
to perform more actions on the underlying repository.</li>
</ul>
<h3>New Features (BREAKING)</h3>
<ul>
<li>
<p>move all possible code from <code>gix</code> to
<code>gix-protocol</code>.
For now, just move the code down and immediately re-integrate in
<code>gix</code>
to be able to use its tests to validate it.</p>
<p>This is a breaking change as some types move and change the
layout.</p>
</li>
<li>
<p>Add <code>gix-shallow</code> crate and use it from <code>gix</code>
and <code>gix-protocol</code>
That way it's easier to reuse shallow-handling code from plumbing
crates.</p>
<p>Note that this is a breaking change as <code>gix-protocol</code> now
uses the <code>gix-shallow::Update</code>
type, which doesn't implement a formerly public <code>from_line()</code>
method anymore.
Now it is available as
<code>fetch::response::shallow_update_from_line()</code>.</p>
</li>
</ul>
<h3>Bug Fixes (BREAKING)</h3>
<ul>
<li>
<p>symlinks_to_directories_are_ignored_like_directories by value
The methods of <code>gix::dirwalk::Options</code> are paired, where for
each
option <code>X</code> of <code>Options</code>, a method named like
<code>X</code> takes and returns
<code>self</code> by value, and a method <code>set_X</code> takes and
returns <code>self</code> by
mutable reference.</p>
<p>But in
<code>symlinks_to_directories_are_ignored_like_directories</code>, both
took <code>self</code> by mutable reference. This fixes that. The effect
of</p>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/3f725122aa173880aaafd4abc43b60bef3b8ca4a"><code>3f72512</code></a>
Release gix v0.69.1</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/3fb0c188cb42c624ebbf5add4140bf8518e05bb2"><code>3fb0c18</code></a>
Merge pull request <a
href="https://redirect.github.com/GitoxideLabs/gitoxide/issues/1740">#1740</a>
from GitoxideLabs/cargo-improvements</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/51a430114493de392ce0c60f462d6e3ff36475a4"><code>51a4301</code></a>
fix: remove unused fetch-error variants</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/d22937f91b8ecd0ece0930c4df9d580f3819b2fe"><code>d22937f</code></a>
Merge pull request <a
href="https://redirect.github.com/GitoxideLabs/gitoxide/issues/1739">#1739</a>
from GitoxideLabs/new-release</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/beb0ea8c4ff94c64b7773772a9d388ccb403f3c1"><code>beb0ea8</code></a>
Release gix-dir v0.11.0, gix-revision v0.31.1, gix-merge v0.2.0,
gix-pack v0....</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/c1ba5719132227410abefeb54e3032b015233e94"><code>c1ba571</code></a>
Release gix-date v0.9.3, gix-object v0.46.1, gix-command v0.4.0,
gix-filter v...</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/7ea85821c6999e3e6cf50a2a009904e9c38642a4"><code>7ea8582</code></a>
update changelogs prior to release</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/06d2738d204ad8ebe4bd68a80c29f040ed8075cc"><code>06d2738</code></a>
Merge pull request <a
href="https://redirect.github.com/GitoxideLabs/gitoxide/issues/1737">#1737</a>
from GitoxideLabs/report</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/2cc65bbdeeeb04248aa2570530e21b9f1fdeadda"><code>2cc65bb</code></a>
finalize gix-shallow crate</li>
<li><a
href="https://github.com/GitoxideLabs/gitoxide/commit/5017e18f3e1a8e1ee4c1dd60d47ee04cbee191f0"><code>5017e18</code></a>
Add the monthly report for December 2024</li>
<li>Additional commits viewable in <a
href="https://github.com/GitoxideLabs/gitoxide/compare/gix-v0.68.0...gix-v0.69.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=gix&package-manager=cargo&previous-version=0.68.0&new-version=0.69.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 156 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 115 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e99f931bd..52c50653b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2210,9 +2210,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "gix"
-version = "0.68.0"
+version = "0.69.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b04c66359b5e17f92395abc433861df0edf48f39f3f590818d1d7217327dd6a1"
+checksum = "8d0eebdaecdcf405d5433a36f85e4f058cf4de48ee2604388be0dbccbaad353e"
 dependencies = [
  "gix-actor",
  "gix-archive",
@@ -2242,11 +2242,13 @@ dependencies = [
  "gix-path",
  "gix-pathspec",
  "gix-prompt",
+ "gix-protocol",
  "gix-ref",
  "gix-refspec",
  "gix-revision",
  "gix-revwalk",
  "gix-sec",
+ "gix-shallow",
  "gix-status",
  "gix-submodule",
  "gix-tempfile",
@@ -2282,9 +2284,9 @@ dependencies = [
 
 [[package]]
 name = "gix-archive"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52a5a8c89ece1375ca7299c80cda039d2a0a5837f2d1d576bb9259e0c6fadad5"
+checksum = "9b63ef086543dce4f2cf9cb1ded1216bbd40332d3abcdd8d876e97f7812d9a26"
 dependencies = [
  "bstr 1.9.1",
  "gix-date",
@@ -2331,9 +2333,9 @@ dependencies = [
 
 [[package]]
 name = "gix-command"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7d6b8f3a64453fd7e8191eb80b351eb7ac0839b40a1237cd2c137d5079fe53"
+checksum = "9405c0a56e17f8365a46870cd2c7db71323ecc8bda04b50cb746ea37bd091e90"
 dependencies = [
  "bstr 1.9.1",
  "gix-path",
@@ -2391,9 +2393,9 @@ dependencies = [
 
 [[package]]
 name = "gix-credentials"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2be87bb8685fc7e6e7032ef71c45068ffff609724a0c897b8047fde10db6ae71"
+checksum = "82a50c56b785c29a151ab4ccf74a83fe4e21d2feda0d30549504b4baed353e0a"
 dependencies = [
  "bstr 1.9.1",
  "gix-command",
@@ -2408,9 +2410,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "691142b1a34d18e8ed6e6114bc1a2736516c5ad60ef3aa9bd1b694886e3ca92d"
+checksum = "c57c477b645ee248b173bb1176b52dd528872f12c50375801a58aaf5ae91113f"
 dependencies = [
  "bstr 1.9.1",
  "itoa",
@@ -2420,9 +2422,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.48.0"
+version = "0.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a327be31a392144b60ab0b1c863362c32a1c8f7effdfa2141d5d5b6b916ef3bf"
+checksum = "a8e92566eccbca205a0a0f96ffb0327c061e85bc5c95abbcddfe177498aa04f6"
 dependencies = [
  "bstr 1.9.1",
  "gix-command",
@@ -2441,9 +2443,9 @@ dependencies = [
 
 [[package]]
 name = "gix-dir"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd6a0618958f9cce78a32724f8e06c4f4a57ca7080f645736d53676dc9b4db9"
+checksum = "fba2ffbcf4bd34438e8a8367ccbc94870549903d1f193a14f47eb6b0967e1293"
 dependencies = [
  "bstr 1.9.1",
  "gix-discover",
@@ -2500,9 +2502,9 @@ dependencies = [
 
 [[package]]
 name = "gix-filter"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5108cc58d58b27df10ac4de7f31b2eb96d588a33e5eba23739b865f5d8db7995"
+checksum = "3d0ecdee5667f840ba20c7fe56d63f8e1dc1e6b3bfd296151fe5ef07c874790a"
 dependencies = [
  "bstr 1.9.1",
  "encoding_rs",
@@ -2521,9 +2523,9 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34740384d8d763975858fa2c176b68652a6fcc09f616e24e3ce967b0d370e4d8"
+checksum = "3b3d4fac505a621f97e5ce2c69fdc425742af00c0920363ca4074f0eb48b1db9"
 dependencies = [
  "fastrand",
  "gix-features",
@@ -2645,9 +2647,9 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.46.0"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65d93e2bbfa83a307e47f45e45de7b6c04d7375a8bd5907b215f4bf45237d879"
+checksum = "e42d58010183ef033f31088479b4eb92b44fe341b35b62d39eb8b185573d77ea"
 dependencies = [
  "bstr 1.9.1",
  "gix-actor",
@@ -2655,6 +2657,7 @@ dependencies = [
  "gix-features",
  "gix-hash",
  "gix-hashtable",
+ "gix-path",
  "gix-utils",
  "gix-validate",
  "itoa",
@@ -2665,9 +2668,9 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.65.0"
+version = "0.66.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93bed6e1b577c25a6bb8e6ecbf4df525f29a671ddf5f2221821a56a8dbeec4e3"
+checksum = "cb780eceb3372ee204469478de02eaa34f6ba98247df0186337e0333de97d0ae"
 dependencies = [
  "arc-swap",
  "gix-date",
@@ -2686,9 +2689,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.55.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b91fec04d359544fecbb8e85117ec746fbaa9046ebafcefb58cb74f20dc76d4"
+checksum = "4158928929be29cae7ab97afc8e820a932071a7f39d8ba388eed2380c12c566c"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -2703,6 +2706,18 @@ dependencies = [
  "uluru",
 ]
 
+[[package]]
+name = "gix-packetline"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "911aeea8b2dabeed2f775af9906152a1f0109787074daf9e64224e3892dde453"
+dependencies = [
+ "bstr 1.9.1",
+ "faster-hex",
+ "gix-trace",
+ "thiserror 2.0.9",
+]
+
 [[package]]
 name = "gix-packetline-blocking"
 version = "0.18.1"
@@ -2745,9 +2760,9 @@ dependencies = [
 
 [[package]]
 name = "gix-prompt"
-version = "0.8.9"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a7822afc4bc9c5fbbc6ce80b00f41c129306b7685cac3248dbfa14784960594"
+checksum = "82433a19aa44688e3bde05c692870eda50b5db053df53ed5ae6d8ea594a6babd"
 dependencies = [
  "gix-command",
  "gix-config-value",
@@ -2756,6 +2771,25 @@ dependencies = [
  "thiserror 2.0.9",
 ]
 
+[[package]]
+name = "gix-protocol"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c84642e8b6fed7035ce9cc449593019c55b0ec1af7a5dce1ab8a0636eaaeb067"
+dependencies = [
+ "bstr 1.9.1",
+ "gix-date",
+ "gix-features",
+ "gix-hash",
+ "gix-ref",
+ "gix-shallow",
+ "gix-transport",
+ "gix-utils",
+ "maybe-async",
+ "thiserror 2.0.9",
+ "winnow 0.6.18",
+]
+
 [[package]]
 name = "gix-quote"
 version = "0.4.14"
@@ -2769,9 +2803,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.49.0"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eae462723686272a58f49501015ef7c0d67c3e042c20049d8dd9c7eff92efde"
+checksum = "a91b61776c839d0f1b7114901179afb0947aa7f4d30793ca1c56d335dfef485f"
 dependencies = [
  "gix-actor",
  "gix-features",
@@ -2804,9 +2838,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44488e0380847967bc3e3cacd8b22652e02ea1eb58afb60edd91847695cd2d8d"
+checksum = "61e1ddc474405a68d2ce8485705dd72fe6ce959f2f5fe718601ead5da2c8f9e7"
 dependencies = [
  "bitflags 2.5.0",
  "bstr 1.9.1",
@@ -2847,11 +2881,23 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "gix-shallow"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2673242e87492cb6ff671f0c01f689061ca306c4020f137197f3abc84ce01"
+dependencies = [
+ "bstr 1.9.1",
+ "gix-hash",
+ "gix-lock",
+ "thiserror 2.0.9",
+]
+
 [[package]]
 name = "gix-status"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201396192ee4c4dd9e8a84fed4b0d2b33d639fca815fb99b0f653dfeddf38585"
+checksum = "1665770e277608bd6b0eaf86adbf6cb3ffc6fb97749e7bc6f9318ac5f37564df"
 dependencies = [
  "bstr 1.9.1",
  "filetime",
@@ -2907,11 +2953,27 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04bdde120c29f1fc23a24d3e115aeeea3d60d8e65bab92cc5f9d90d9302eb952"
 
+[[package]]
+name = "gix-transport"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d91e507a8713cfa2318d5a85d75b36e53a40379cc7eb7634ce400ecacbaf"
+dependencies = [
+ "bstr 1.9.1",
+ "gix-command",
+ "gix-features",
+ "gix-packetline",
+ "gix-quote",
+ "gix-sec",
+ "gix-url",
+ "thiserror 2.0.9",
+]
+
 [[package]]
 name = "gix-traverse"
-version = "0.43.0"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff2ec9f779680f795363db1c563168b32b8d6728ec58564c628e85c92d29faf"
+checksum = "6ed47d648619e23e93f971d2bba0d10c1100e54ef95d2981d609907a8cabac89"
 dependencies = [
  "bitflags 2.5.0",
  "gix-commitgraph",
@@ -2926,13 +2988,14 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.28.1"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e09f97db3618fb8e473d7d97e77296b50aaee0ddcd6a867f07443e3e87391099"
+checksum = "d096fb733ba6bd3f5403dba8bd72bdd8809fe2b347b57844040b8f49c93492d9"
 dependencies = [
  "bstr 1.9.1",
  "gix-features",
  "gix-path",
+ "percent-encoding",
  "thiserror 2.0.9",
  "url",
 ]
@@ -2979,9 +3042,9 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree-state"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebd5eead61d37b334bc31810c9980aa72d659044513cae0e342a88fed2c22ba"
+checksum = "672a5416fae50538a0af0374bf67e0c97a932fd9e9b72f7d4bfd25355967cbe1"
 dependencies = [
  "bstr 1.9.1",
  "gix-features",
@@ -2999,9 +3062,9 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree-stream"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1879375cbd896823237480a3034aa9fa056b4f9dc9f35a4ac8cd4dc052b2793"
+checksum = "34005eae2c0482eeb840e67bdd317ffe6e34057ea4bd8c910fecaee521db69cf"
 dependencies = [
  "gix-attributes",
  "gix-features",
@@ -3745,7 +3808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3875,6 +3938,17 @@ dependencies = [
  "rawpointer",
 ]
 
+[[package]]
+name = "maybe-async"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.93",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.2"