Skip to content

Commit

Permalink
[mononoke] Update gitoxide to version with lenient tag parsing
Browse files Browse the repository at this point in the history
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.

Test Plan:
```
fbcode/common/rust/tools/scripts/third-party-check.sh
```
succeeded

```
buck test mode/dev-nosan-lg //eden/mononoke/tests/integration/gitimport -- test-gitimport-bad-tag.t
```
https://www.internalfb.com/intern/testinfra/testrun/15762598747751592

Reviewed By: RajivTS, singhsrb

Differential Revision: D63771328

fbshipit-source-id: fdbc9d762bacf48c7b17615181371cd92a4a921f
  • Loading branch information
Pierre Chevalier authored and facebook-github-bot committed Oct 3, 2024
1 parent d060caf commit 2397ada
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion antlir/antlir2/sendstream_parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ hex = "0.4.3"
nix = "0.25"
nom = "7.1"
serde = { version = "1.0.185", features = ["derive", "rc"], optional = true }
thiserror = "1.0.49"
thiserror = "1.0.64"
tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] }
uuid = { version = "1.2", features = ["serde", "v4", "v5", "v6", "v7", "v8"] }

Expand Down

0 comments on commit 2397ada

Please sign in to comment.