Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 44 deletions

diff --git a/vendor/gix-worktree/Cargo.toml b/vendor/gix-worktree/Cargo.toml
index a6a8c4769..5b8133ecf 100644
--- a/vendor/gix-worktree/Cargo.toml
+++ b/vendor/gix-worktree/Cargo.toml
@@ -11,17 +11,18 @@
 
 [package]
 edition = "2021"
-rust-version = "1.64"
+rust-version = "1.65"
 name = "gix-worktree"
-version = "0.18.0"
+version = "0.26.0"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 include = [
     "src/**/*",
     "LICENSE-*",
     "CHANGELOG.md",
 ]
-description = "A WIP crate of the gitoxide project dedicated implementing everything around working trees and git excludes"
-license = "MIT/Apache-2.0"
+autotests = false
+description = "A crate of the gitoxide project for shared worktree related types and utilities."
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/Byron/gitoxide"
 
 [package.metadata.docs.rs]
@@ -37,16 +38,6 @@ rustdoc-args = [
 [lib]
 doctest = false
 
-[[test]]
-name = "multi-threaded"
-path = "tests/worktree-multi-threaded.rs"
-required-features = ["internal-testing-gix-features-parallel"]
-
-[[test]]
-name = "single-threaded"
-path = "tests/worktree-single-threaded.rs"
-required-features = ["internal-testing-to-avoid-being-run-by-cargo-test-all"]
-
 [dependencies.bstr]
 version = "1.3.0"
 default-features = false
@@ -55,38 +46,33 @@ default-features = false
 version = "0.2.0"
 optional = true
 
-[dependencies.filetime]
-version = "0.2.15"
-
 [dependencies.gix-attributes]
-version = "^0.13.0"
+version = "^0.19.0"
+optional = true
 
 [dependencies.gix-features]
-version = "^0.30.0"
+version = "^0.35.0"
 
 [dependencies.gix-fs]
-version = "^0.2.0"
+version = "^0.7.0"
 
 [dependencies.gix-glob]
-version = "^0.8.0"
+version = "^0.13.0"
 
 [dependencies.gix-hash]
-version = "^0.11.2"
+version = "^0.13.0"
 
 [dependencies.gix-ignore]
-version = "^0.3.0"
+version = "^0.8.0"
 
 [dependencies.gix-index]
-version = "^0.17.0"
+version = "^0.25.0"
 
 [dependencies.gix-object]
-version = "^0.30.0"
+version = "^0.37.0"
 
 [dependencies.gix-path]
-version = "^0.8.1"
-
-[dependencies.io-close]
-version = "0.3.7"
+version = "^0.10.0"
 
 [dependencies.serde]
 version = "1.0.114"
@@ -94,27 +80,15 @@ features = ["derive"]
 optional = true
 default-features = false
 
-[dependencies.thiserror]
-version = "1.0.26"
-
-[dev-dependencies.symlink]
-version = "0.1.0"
-
-[dev-dependencies.tempfile]
-version = "3.2.0"
-
-[dev-dependencies.walkdir]
-version = "2.3.2"
-
 [features]
-internal-testing-gix-features-parallel = ["gix-features/parallel"]
-internal-testing-to-avoid-being-run-by-cargo-test-all = []
+attributes = ["dep:gix-attributes"]
+default = ["attributes"]
 serde = [
     "dep:serde",
     "bstr/serde",
     "gix-index/serde",
     "gix-hash/serde",
     "gix-object/serde",
-    "gix-attributes/serde",
+    "gix-attributes?/serde",
     "gix-ignore/serde",
 ]