-
-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1774 from EliahKagan/complex-graph-no-baseline-next
Use `parse_spec_no_baseline` with `:/` for all 2.47.* on CI
- Loading branch information
Showing
1 changed file
with
6 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -96,16 +96,17 @@ mod find_youngest_matching_commit { | |
let repo = repo("complex_graph").unwrap(); | ||
|
||
// The full Linux CI `test` job regenerates baselines instead of taking them from archives. | ||
// In Git 2.47.0 (and 2.47.1), the traversal order differs, so some `parse_spec` assertions | ||
// fail. This is a Git bug with a forthcoming fix. For now, we use `parse_spec_no_baseline` | ||
// for them when tests are run that way with known-affected Git versions. For details, see: | ||
// Traversal order with `:/` is broken in Git 2.47.*, so some `parse_spec` assertions fail. | ||
// The fix is in Git 2.48.* but is not backported. For now, we use `parse_spec_no_baseline` | ||
// in affected test cases when they are run on CI with Git 2.47.*. For details, see: | ||
// | ||
// - https://lore.kernel.org/git/[email protected]/T/ | ||
// - https://lore.kernel.org/git/[email protected]/T/ | ||
// - https://github.com/GitoxideLabs/gitoxide/issues/1622#issuecomment-2529580735 | ||
// - https://github.com/git/git/blob/v2.48.0/Documentation/RelNotes/2.48.0.txt#L294-L296 | ||
// - https://github.com/GitoxideLabs/gitoxide/issues/1622 | ||
let skip_some_baselines = is_ci::cached() | ||
&& std::env::var_os("GIX_TEST_IGNORE_ARCHIVES").is_some() | ||
&& ((2, 47, 0)..(2, 47, 2)).contains(&gix_testtools::GIT_VERSION); | ||
&& ((2, 47, 0)..(2, 48, 0)).contains(&gix_testtools::GIT_VERSION); | ||
|
||
if skip_some_baselines { | ||
assert_eq!( | ||
|