update gix crates to their latest published versions

Summary: This is to make it easier to get GitoxideLabs/gitoxide#1543 once it's released upstream. There was an uncompatibility between `c2pa` which requires an older version of `url` as they want to have lawyers check the Unicode 3.0 license and `gix-url` which required latest `url` to support the nightly compiler. I "resolved" it by removing the restriction from `c2pa` and pointing at that for now. I also raised an issue upstream: contentauth/c2pa-rs#571 to bring it back to their awareness, so hopefully we can move off my fork soon enough. Reviewed By: YousefSalama, dtolnay Differential Revision: D57676392 fbshipit-source-id: fc5cabc860de9200abf3fe1145a3dbdef2a96efa
facebook · Aug 28, 2024 · ca90f89 · ca90f89
1 parent 5102050
commit ca90f89
Show file tree

Hide file tree

Showing 41 changed files with 92 additions and 77 deletions.
diff --git a/eden/fs/cli_rs/edenfs-client/Cargo.toml b/eden/fs/cli_rs/edenfs-client/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPLv2+"
 
 [dependencies]
 anyhow = "1.0.86"
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 atomicfile = { version = "0.1.0", path = "../../../scm/lib/atomicfile" }
 byteorder = "1.3"
 dirs = "2.0"

diff --git a/eden/mononoke/blobrepo_utils/Cargo.toml b/eden/mononoke/blobrepo_utils/Cargo.toml
@@ -13,7 +13,7 @@ path = "test/main.rs"
 
 [dependencies]
 anyhow = "1.0.86"
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 blobrepo_hg = { version = "0.1.0", path = "../blobrepo/blobrepo_hg" }
 blobrepo_override = { version = "0.1.0", path = "../blobrepo/override" }
 blobstore = { version = "0.1.0", path = "../blobstore" }

diff --git a/eden/mononoke/bonsai_git_mapping/Cargo.toml b/eden/mononoke/bonsai_git_mapping/Cargo.toml
@@ -23,7 +23,7 @@ caching_ext = { version = "0.1.0", path = "../common/rust/caching_ext" }
 context = { version = "0.1.0", path = "../server/context" }
 facet = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
-gix-hash = "0.11"
+gix-hash = "0.14.2"
 justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 memcache = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 mononoke_types = { version = "0.1.0", path = "../mononoke_types" }

diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/Cargo.toml b/eden/mononoke/commit_rewriting/cross_repo_sync/Cargo.toml
@@ -13,7 +13,7 @@ path = "test/main.rs"
 
 [dependencies]
 anyhow = "1.0.86"
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 async-trait = "0.1.71"
 blobstore = { version = "0.1.0", path = "../../blobstore" }
 bonsai_git_mapping = { version = "0.1.0", path = "../../bonsai_git_mapping" }

diff --git a/eden/mononoke/derived_data/basename_suffix_skeleton_manifest_v3/Cargo.toml b/eden/mononoke/derived_data/basename_suffix_skeleton_manifest_v3/Cargo.toml
@@ -27,7 +27,7 @@ skeleton_manifest = { version = "0.1.0", path = "../skeleton_manifest" }
 vec1 = { version = "1", features = ["serde"] }
 
 [dev-dependencies]
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" }
 bookmarks = { version = "0.1.0", path = "../../bookmarks" }
 commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" }

diff --git a/eden/mononoke/derived_data/manager/Cargo.toml b/eden/mononoke/derived_data/manager/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
 
 [dependencies]
 anyhow = "1.0.86"
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 async-trait = "0.1.71"
 blobstore = { version = "0.1.0", path = "../../blobstore" }
 bonsai_git_mapping = { version = "0.1.0", path = "../../bonsai_git_mapping" }

diff --git a/eden/mononoke/derived_data/skeleton_manifest_v2/Cargo.toml b/eden/mononoke/derived_data/skeleton_manifest_v2/Cargo.toml
@@ -25,7 +25,7 @@ mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
 skeleton_manifest = { version = "0.1.0", path = "../skeleton_manifest" }
 
 [dev-dependencies]
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" }
 bookmarks = { version = "0.1.0", path = "../../bookmarks" }
 commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" }

diff --git a/eden/mononoke/derived_data/test_manifest/Cargo.toml b/eden/mononoke/derived_data/test_manifest/Cargo.toml
@@ -23,7 +23,7 @@ mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
 skeleton_manifest = { version = "0.1.0", path = "../skeleton_manifest" }
 
 [dev-dependencies]
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" }
 bookmarks = { version = "0.1.0", path = "../../bookmarks" }
 commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" }

diff --git a/eden/mononoke/derived_data/test_sharded_manifest/Cargo.toml b/eden/mononoke/derived_data/test_sharded_manifest/Cargo.toml
@@ -26,7 +26,7 @@ sorted_vector_map = { version = "0.2.0", git = "https://github.com/facebookexper
 test_manifest = { version = "0.1.0", path = "../test_manifest" }
 
 [dev-dependencies]
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" }
 bookmarks = { version = "0.1.0", path = "../../bookmarks" }
 commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" }

diff --git a/eden/mononoke/features/history_traversal/Cargo.toml b/eden/mononoke/features/history_traversal/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPLv2+"
 
 [dependencies]
 anyhow = "1.0.86"
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 async-trait = "0.1.71"
 blame = { version = "0.1.0", path = "../../derived_data/blame" }
 blobstore = { version = "0.1.0", path = "../../blobstore" }

diff --git a/eden/mononoke/features/repo_update_logger/Cargo.toml b/eden/mononoke/features/repo_update_logger/Cargo.toml
@@ -21,7 +21,7 @@ context = { version = "0.1.0", path = "../../server/context" }
 ephemeral_blobstore = { version = "0.1.0", path = "../../blobstore/ephemeral_blobstore" }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
 git_source_of_truth = { version = "0.1.0", path = "../../git_source_of_truth" }
-gix-hash = "0.11"
+gix-hash = "0.14.2"
 hostname = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 logger_ext = { version = "0.1.0", path = "../../common/logger_ext" }
 metaconfig_types = { version = "0.1.0", path = "../../metaconfig/types" }

diff --git a/eden/mononoke/git/git_types/Cargo.toml b/eden/mononoke/git/git_types/Cargo.toml
@@ -19,13 +19,13 @@ derived_data_manager = { version = "0.1.0", path = "../../derived_data/manager"
 derived_data_service_if = { version = "0.1.0", path = "../../derived_data/remote/if" }
 digest = "0.10"
 filestore = { version = "0.1.0", path = "../../filestore" }
-flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false }
+flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
 git_delta = { version = "0.1.0", path = "../../third_party/git_delta" }
 git_types_thrift = { version = "0.1.0", path = "if" }
-gix-actor = "0.24"
-gix-hash = "0.11"
-gix-object = "0.33"
+gix-actor = "0.32.0"
+gix-hash = "0.14.2"
+gix-object = "0.44.0"
 itertools = "0.11.0"
 lazy_static = "1.4"
 manifest = { version = "0.1.0", path = "../../manifest" }

diff --git a/eden/mononoke/git/gitimport/Cargo.toml b/eden/mononoke/git/gitimport/Cargo.toml
@@ -25,7 +25,7 @@ fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rus
 filestore = { version = "0.1.0", path = "../../filestore" }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
 git_symbolic_refs = { version = "0.1.0", path = "../../git_symbolic_refs" }
-gix-hash = "0.11"
+gix-hash = "0.14.2"
 import_direct = { version = "0.1.0", path = "../import_direct" }
 import_tools = { version = "0.1.0", path = "../import_tools" }
 linked-hash-map = { version = "0.5", features = ["serde_impl"] }

diff --git a/eden/mononoke/git/import_direct/Cargo.toml b/eden/mononoke/git/import_direct/Cargo.toml
@@ -16,7 +16,7 @@ bytes = { version = "1.6.0", features = ["serde"] }
 commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" }
 context = { version = "0.1.0", path = "../../server/context" }
 filestore = { version = "0.1.0", path = "../../filestore" }
-gix-hash = "0.11"
+gix-hash = "0.14.2"
 import_tools = { version = "0.1.0", path = "../import_tools" }
 mononoke_api = { version = "0.1.0", path = "../../mononoke_api" }
 mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }

diff --git a/eden/mononoke/git/import_tools/Cargo.toml b/eden/mononoke/git/import_tools/Cargo.toml
@@ -30,9 +30,9 @@ futures = { version = "0.3.30", features = ["async-await", "compat"] }
 futures_stats = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 git_symbolic_refs = { version = "0.1.0", path = "../../git_symbolic_refs" }
 git_types = { version = "0.1.0", path = "../git_types" }
-gix-actor = "0.24"
-gix-hash = "0.11"
-gix-object = "0.33"
+gix-actor = "0.32.0"
+gix-hash = "0.14.2"
+gix-object = "0.44.0"
 http = "0.2"
 hyper = { version = "0.14.26", features = ["client", "http1", "http2", "stream"] }
 hyper-openssl = "0.9"

diff --git a/eden/mononoke/git/import_tools/src/gitimport_objects.rs b/eden/mononoke/git/import_tools/src/gitimport_objects.rs
@@ -109,24 +109,24 @@ async fn load_git_tree<const SUBMODULES: bool, Reader: GitReader>(
                     Err(e) => return Some(Err(e)),
                 };
 
-                let r = match mode {
-                    tree::EntryMode::Blob => {
+                let r = match mode.into() {
+                    tree::EntryKind::Blob => {
                         Some((name, Entry::Leaf((FileType::Regular, GitLeaf(oid)))))
                     }
-                    tree::EntryMode::BlobExecutable => {
+                    tree::EntryKind::BlobExecutable => {
                         Some((name, Entry::Leaf((FileType::Executable, GitLeaf(oid)))))
                     }
-                    tree::EntryMode::Link => {
+                    tree::EntryKind::Link => {
                         Some((name, Entry::Leaf((FileType::Symlink, GitLeaf(oid)))))
                     }
-                    tree::EntryMode::Tree => Some((name, Entry::Tree(GitTree(oid)))),
+                    tree::EntryKind::Tree => Some((name, Entry::Tree(GitTree(oid)))),
 
                     // Git submodules are represented as ObjectType::Commit inside the tree.
                     //
                     // Depending on the repository configuration, we may or may not wish to
                     // include submodules in the imported manifest.  Generate a leaf on the
                     // basis of the SUBMODULES parameter.
-                    tree::EntryMode::Commit => {
+                    tree::EntryKind::Commit => {
                         if SUBMODULES {
                             Some((name, Entry::Leaf((FileType::GitSubmodule, GitLeaf(oid)))))
                         } else {

diff --git a/eden/mononoke/git/packfile/Cargo.toml b/eden/mononoke/git/packfile/Cargo.toml
@@ -16,12 +16,12 @@ anyhow = "1.0.86"
 blobstore = { version = "0.1.0", path = "../../blobstore" }
 bytes = { version = "1.6.0", features = ["serde"] }
 fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
-flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false }
+flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
-gix-features = { version = "0.32", features = ["parallel", "rustsha1"] }
-gix-hash = "0.11"
-gix-object = "0.33"
-gix-pack = "0.40"
+gix-features = { version = "0.38.2", features = ["parallel", "rustsha1"] }
+gix-hash = "0.14.2"
+gix-object = "0.44.0"
+gix-pack = "0.53.0"
 mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
 packfile_thrift = { version = "0.1.0", path = "if" }
 pin-project = "0.4.30"

diff --git a/eden/mononoke/git/packfile/src/types.rs b/eden/mononoke/git/packfile/src/types.rs
@@ -161,7 +161,7 @@ impl BaseObject {
 
     /// The uncompressed size of the Git object contained within the pack item.
     pub fn size(&self) -> usize {
-        self.object.size()
+        self.object.size() as usize
     }
 
     /// The 20-byte SHA1 hash (ObjectId) of the Git object contained within the

diff --git a/eden/mononoke/git/packfile/test/packfile_test.rs b/eden/mononoke/git/packfile/test/packfile_test.rs
@@ -46,7 +46,7 @@ async fn get_objects_stream(
     }))?);
     let tree_bytes = Bytes::from(to_vec_bytes(&gix_object::Object::Tree(gix_object::Tree {
         entries: vec![gix_object::tree::Entry {
-            mode: gix_object::tree::EntryMode::Blob,
+            mode: gix_object::tree::EntryKind::Blob.into(),
             filename: "JustAFile.txt".into(),
             oid: ObjectId::empty_blob(gix_hash::Kind::Sha1),
         }],
@@ -190,7 +190,10 @@ async fn validate_packfile_generation_format() -> anyhow::Result<()> {
     assert_eq!(opened_packfile.data_len(), size as usize);
     // Verify the checksum of the packfile
     let checksum_from_file = opened_packfile
-        .verify_checksum(gix_features::progress::Discard, &AtomicBool::new(false))
+        .verify_checksum(
+            &mut gix_features::progress::Discard,
+            &AtomicBool::new(false),
+        )
         .expect("Expected successful checksum computation");
     // Verify the checksum matches the hash generated when computing the packfile
     assert_eq!(checksum, checksum_from_file);
@@ -226,7 +229,7 @@ async fn validate_staggered_packfile_generation() -> anyhow::Result<()> {
         .expect("Expected successful write of object to packfile");
     let tree_bytes = Bytes::from(to_vec_bytes(&gix_object::Object::Tree(gix_object::Tree {
         entries: vec![gix_object::tree::Entry {
-            mode: gix_object::tree::EntryMode::Blob,
+            mode: gix_object::tree::EntryKind::Blob.into(),
             filename: "JustAFile.txt".into(),
             oid: ObjectId::empty_blob(gix_hash::Kind::Sha1),
         }],
@@ -260,7 +263,10 @@ async fn validate_staggered_packfile_generation() -> anyhow::Result<()> {
     assert_eq!(opened_packfile.data_len(), size as usize);
     // Verify the checksum of the packfile
     let checksum_from_file = opened_packfile
-        .verify_checksum(gix_features::progress::Discard, &AtomicBool::new(false))
+        .verify_checksum(
+            &mut gix_features::progress::Discard,
+            &AtomicBool::new(false),
+        )
         .expect("Expected successful checksum computation");
     // Verify the checksum matches the hash generated when computing the packfile
     assert_eq!(checksum, checksum_from_file);

diff --git a/eden/mononoke/git/protocol/Cargo.toml b/eden/mononoke/git/protocol/Cargo.toml
@@ -24,11 +24,11 @@ filestore = { version = "0.1.0", path = "../../filestore" }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
 git_symbolic_refs = { version = "0.1.0", path = "../../git_symbolic_refs" }
 git_types = { version = "0.1.0", path = "../git_types" }
-gix-date = "0.7"
-gix-features = { version = "0.32", features = ["parallel", "rustsha1"] }
-gix-hash = "0.11"
-gix-object = "0.33"
-gix-pack = "0.40"
+gix-date = "0.9.0"
+gix-features = { version = "0.38.2", features = ["parallel", "rustsha1"] }
+gix-hash = "0.14.2"
+gix-object = "0.44.0"
+gix-pack = "0.53.0"
 manifest = { version = "0.1.0", path = "../../manifest" }
 metaconfig_types = { version = "0.1.0", path = "../../metaconfig/types" }
 mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }

diff --git a/eden/mononoke/git/protocol/src/pack_processor.rs b/eden/mononoke/git/protocol/src/pack_processor.rs
@@ -60,7 +60,7 @@ fn git_object_bytes(
     kind: gix_object::Kind,
     size: usize,
 ) -> Vec<u8> {
-    let mut object_bytes = loose_header(kind, size).into_vec();
+    let mut object_bytes = loose_header(kind, size as u64).into_vec();
     object_bytes.extend(headerless_object_bytes);
     object_bytes
 }
@@ -159,7 +159,7 @@ async fn parse_stored_pack(
     })?;
     // Verify that the packfile is valid
     pack_file
-        .verify_checksum(Discard, &AtomicBool::new(false))
+        .verify_checksum(&mut Discard, &AtomicBool::new(false))
         .context("The checksum of the packfile is invalid")?;
 
     // Load all the prerequisite objects
@@ -178,7 +178,8 @@ async fn parse_stored_pack(
                 .decode_entry(
                     into_data_entry(entry),
                     &mut output,
-                    |oid, out| resolve_delta(oid, out, &prereq_objects),
+                    &mut gix_features::zlib::Inflate::default(),
+                    &|oid, out| resolve_delta(oid, out, &prereq_objects),
                     &mut Never,
                 )
                 .context(err_context)?;

diff --git a/eden/mononoke/git_server/Cargo.toml b/eden/mononoke/git_server/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPLv2+"
 
 [dependencies]
 anyhow = "1.0.86"
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 async-stream = "0.3"
 async-trait = "0.1.71"
 bonsai_git_mapping = { version = "0.1.0", path = "../bonsai_git_mapping" }
@@ -24,16 +24,16 @@ context = { version = "0.1.0", path = "../server/context" }
 environment = { version = "0.1.0", path = "../cmdlib/environment" }
 executor_lib = { version = "0.1.0", path = "../cmdlib/sharding" }
 fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
-flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false }
+flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
 futures_stats = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 git_source_of_truth = { version = "0.1.0", path = "../git_source_of_truth" }
 git_types = { version = "0.1.0", path = "../git/git_types" }
-gix-date = "0.7"
-gix-hash = "0.11"
-gix-object = "0.33"
-gix-packetline = { version = "0.17.2", features = ["blocking-io"] }
-gix-transport = "0.41"
+gix-date = "0.9.0"
+gix-hash = "0.14.2"
+gix-object = "0.44.0"
+gix-packetline = { version = "0.17.6", features = ["blocking-io"] }
+gix-transport = "0.42.3"
 gotham = "0.7.1"
 gotham_derive = "0.7.0"
 gotham_ext = { version = "0.1.0", path = "../gotham_ext" }

diff --git a/eden/mononoke/mercurial/revlog/Cargo.toml b/eden/mononoke/mercurial/revlog/Cargo.toml
@@ -15,7 +15,7 @@ anyhow = "1.0.86"
 ascii = "1.0"
 bitflags = { version = "2.4", features = ["serde"] }
 bytes = { version = "1.6.0", features = ["serde"] }
-flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false }
+flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false }
 futures_ext = { package = "futures_01_ext", version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 futures_old = { package = "futures", version = "0.1.31" }
 lz4-pyframe = { version = "0.1.0", path = "../../../scm/lib/lz4-pyframe" }

diff --git a/eden/mononoke/mononoke_api/Cargo.toml b/eden/mononoke/mononoke_api/Cargo.toml
@@ -52,7 +52,7 @@ futures_stats = { version = "0.1.0", git = "https://github.com/facebookexperimen
 git_source_of_truth = { version = "0.1.0", path = "../git_source_of_truth" }
 git_symbolic_refs = { version = "0.1.0", path = "../git_symbolic_refs" }
 git_types = { version = "0.1.0", path = "../git/git_types" }
-gix-hash = "0.11"
+gix-hash = "0.14.2"
 history_traversal = { version = "0.1.0", path = "../features/history_traversal" }
 hook_manager = { version = "0.1.0", path = "../repo_attributes/hook_manager/hook_manager" }
 hooks = { version = "0.1.0", path = "../hooks" }
@@ -116,7 +116,7 @@ cross_repo_sync_test_utils = { version = "0.1.0", path = "../commit_rewriting/cr
 fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 fbinit-tokio = { version = "0.1.2", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 fixtures = { version = "0.1.0", path = "../tests/fixtures" }
-gix-object = "0.33"
+gix-object = "0.44.0"
 mononoke_macros = { version = "0.1.0", path = "../mononoke_macros" }
 pretty_assertions = { version = "1.2", features = ["alloc"], default-features = false }
 test_repo_factory = { version = "0.1.0", path = "../repo_factory/test_repo_factory" }

diff --git a/eden/mononoke/mononoke_types/Cargo.toml b/eden/mononoke/mononoke_types/Cargo.toml
@@ -12,7 +12,7 @@ abomonation = { version = "0.7", features = ["smallvec"] }
 abomonation_derive = "0.5"
 anyhow = "1.0.86"
 ascii = "1.0"
-async-recursion = "1.0.2"
+async-recursion = "1.1.1"
 async-trait = "0.1.71"
 bincode = "1.3.3"
 bit-set = "0.5"
@@ -30,8 +30,8 @@ edenapi_types = { version = "0.1.0", path = "../../scm/lib/edenapi/types" }
 faster-hex = "0.6.1"
 fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
-gix-date = "0.7"
-gix-hash = "0.11"
+gix-date = "0.9.0"
+gix-hash = "0.14.2"
 itertools = "0.11.0"
 lazy_static = "1.4"
 lfs_protocol = { version = "0.1.0", path = "../lfs_protocol" }

diff --git a/eden/mononoke/repo_import/Cargo.toml b/eden/mononoke/repo_import/Cargo.toml
@@ -31,7 +31,7 @@ fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rus
 filenodes = { version = "0.1.0", path = "../filenodes" }
 filestore = { version = "0.1.0", path = "../filestore" }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
-gix-hash = "0.11"
+gix-hash = "0.14.2"
 import_direct = { version = "0.1.0", path = "../git/import_direct" }
 import_tools = { version = "0.1.0", path = "../git/import_tools" }
 itertools = "0.11.0"

diff --git a/eden/mononoke/tests/integration/gitimport/test-gitimport-bad-tag.t b/eden/mononoke/tests/integration/gitimport/test-gitimport-bad-tag.t
@@ -82,7 +82,7 @@
          tagger mononoke <mononoke@mononoke>
          ```
          into object of kind Tag
-
+      2: object parsing failed
   Error: Execution failed