Skip to content

Commit fe33fa7

Browse files
committed
Use parse_spec_no_baseline with :/ for all 2.47.* on CI
The bug in Git that causes #1622 has been fixed since 2.48.0 and does not affect any versions prior to 2.47, but the fix is not backported to subsequent 2.47.* point releases. In particular, 2.47.2 has been released, with backported security fixes, but it does not have backported fixes for this non-security bug. This builds on #1635 and #1719 by updating the range of Git versions where we skip the affected baseline checks on CI (for platforms this affects on our CI) from `(2, 47, 0)..(2, 47, 2)` to `(2, 47, 0)..(2, 48, 0)`, i.e., with the exclusive upper bound changed from 2.47.2 to the correct value of 2.48.0. This also revises the comments accordingly. For further details, see: #1622 (comment) (This change is item (1) there.)
1 parent c2d1a5d commit fe33fa7

File tree

1 file changed

+6
-5
lines changed
  • gix/tests/gix/revision/spec/from_bytes

1 file changed

+6
-5
lines changed

gix/tests/gix/revision/spec/from_bytes/regex.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,17 @@ mod find_youngest_matching_commit {
9696
let repo = repo("complex_graph").unwrap();
9797

9898
// The full Linux CI `test` job regenerates baselines instead of taking them from archives.
99-
// In Git 2.47.0 (and 2.47.1), the traversal order differs, so some `parse_spec` assertions
100-
// fail. This is a Git bug with a forthcoming fix. For now, we use `parse_spec_no_baseline`
101-
// for them when tests are run that way with known-affected Git versions. For details, see:
99+
// Traversal order with `:/` is broken in Git 2.47.*, so some `parse_spec` assertions fail.
100+
// The fix is in Git 2.48.* but is not backported. For now, we use `parse_spec_no_baseline`
101+
// in affected test cases when they are run on CI with Git 2.47.*. For details, see:
102102
//
103103
// - https://lore.kernel.org/git/[email protected]/T/
104104
// - https://lore.kernel.org/git/[email protected]/T/
105-
// - https://github.com/GitoxideLabs/gitoxide/issues/1622#issuecomment-2529580735
105+
// - https://github.com/git/git/blob/v2.48.0/Documentation/RelNotes/2.48.0.txt#L294-L296
106+
// - https://github.com/GitoxideLabs/gitoxide/issues/1622
106107
let skip_some_baselines = is_ci::cached()
107108
&& std::env::var_os("GIX_TEST_IGNORE_ARCHIVES").is_some()
108-
&& ((2, 47, 0)..(2, 47, 2)).contains(&gix_testtools::GIT_VERSION);
109+
&& ((2, 47, 0)..(2, 48, 0)).contains(&gix_testtools::GIT_VERSION);
109110

110111
if skip_some_baselines {
111112
assert_eq!(

0 commit comments

Comments
 (0)