From 601f5513ab716a71d1cb7c399d734ffddcd3a14c Mon Sep 17 00:00:00 2001 From: Pierre Chevalier Date: Thu, 3 Oct 2024 07:20:59 -0700 Subject: [PATCH] Update gitoxide to version with lenient tag parsing Summary: ignore-conflict-markers A while ago, I made the parsing of tags in gitoxide tolerate a missing timestamp. We have now seen this situation in two repos: * aosp/platform/external/brctl * aosp/platform/external/iproute2 Update all gitoxide crates to their latest version (equivalent to upstream main) to propagate that fix to us. I had to list all gitoxide crates explicitely to avoid issues with conflicting requirements for any crates in the dependency chain. The commit I'm pointing at in my fork of gitoxide is litterally `main` plus a version update to propagate the fix throughout the gix ecosystem. NOTE: I had to slightly edit the integration test to make the failure representative of the incorrect parsing, but see the updated integration test for proof that the latest version can parse a tag that's missing a timestamp. Reviewed By: RajivTS, singhsrb Differential Revision: D63771328 fbshipit-source-id: fdbc9d762bacf48c7b17615181371cd92a4a921f --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 274a35f5..cae322ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cached" @@ -1271,18 +1271,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote",