Skip to content

Remove :/ baseline skip (always check :/ baselines) #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2025
Merged

Remove :/ baseline skip (always check :/ baselines) #1993

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2400158
Flip `:/` baseline skip from CI to local and extend
EliahKagan May 5, 2025
b623bf1
Completely remove `:/` baseline skip
EliahKagan May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 8 additions & 35 deletions gix/tests/gix/revision/spec/from_bytes/regex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,47 +95,20 @@ mod find_youngest_matching_commit {
fn regex_matches() {
let repo = repo("complex_graph").unwrap();

// The full Linux CI `test` job regenerates baselines instead of taking them from archives.
// 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/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, 48, 0)).contains(&gix_testtools::GIT_VERSION);

if skip_some_baselines {
assert_eq!(
parse_spec_no_baseline(":/mes.age", &repo).unwrap(),
Spec::from_id(hex_to_id("ef80b4b77b167f326351c93284dc0eb00dd54ff4").attach(&repo))
);
} else {
assert_eq!(
parse_spec(":/mes.age", &repo).unwrap(),
Spec::from_id(hex_to_id("ef80b4b77b167f326351c93284dc0eb00dd54ff4").attach(&repo))
);
}
assert_eq!(
parse_spec(":/mes.age", &repo).unwrap(),
Spec::from_id(hex_to_id("ef80b4b77b167f326351c93284dc0eb00dd54ff4").attach(&repo))
);

assert_eq!(
parse_spec(":/not there", &repo).unwrap_err().to_string(),
"None of 10 commits reached from all references matched regex \"not there\""
);

if skip_some_baselines {
assert_eq!(
parse_spec_no_baseline(":/!-message", &repo).unwrap(),
Spec::from_id(hex_to_id("55e825ebe8fd2ff78cad3826afb696b96b576a7e").attach(&repo))
);
} else {
assert_eq!(
parse_spec(":/!-message", &repo).unwrap(),
Spec::from_id(hex_to_id("55e825ebe8fd2ff78cad3826afb696b96b576a7e").attach(&repo))
);
}
assert_eq!(
parse_spec(":/!-message", &repo).unwrap(),
Spec::from_id(hex_to_id("55e825ebe8fd2ff78cad3826afb696b96b576a7e").attach(&repo))
);

assert_eq!(
parse_spec("@^{/!-B}", &repo).unwrap(),
Expand Down
Loading