Skip to content

fix(xtest): normalize refs/heads/ prefix in version resolution #444

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
dmihalcik-virtru merged 3 commits into from
May 1, 2026
Merged

fix(xtest): normalize refs/heads/ prefix in version resolution #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4aaa6e
fix(otdf-sdk-mgr): normalize refs/heads/ prefix in version resolution
dmihalcik-virtru Apr 30, 2026
8275879
fixup more idiomatic python
dmihalcik-virtru May 1, 2026
8d03232
fixup pyright is a stickler
dmihalcik-virtru May 1, 2026
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
3 changes: 2 additions & 1 deletion otdf-sdk-mgr/src/otdf_sdk_mgr/resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ def _annotate(result: ResolveResult) -> ResolveResult:

try:
repo = Git()
if version == "main" or version == "refs/heads/main":
version = version.removeprefix("refs/heads/")
if version == "main":
all_heads = [r.split("\t") for r in repo.ls_remote(sdk_url, heads=True).split("\n")]
try:
sha, _ = next(tag for tag in all_heads if "refs/heads/main" in tag)
Expand Down
12 changes: 12 additions & 0 deletions otdf-sdk-mgr/tests/test_resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,18 @@ def test_refs_heads_main_alias(self):
assert is_resolve_success(result)
assert result["tag"] == "main"

def test_refs_heads_non_main_branch(self):
ls = make_ls_remote(
(SHA40, "refs/heads/release/sdk-v0.17"),
(SHA40, "refs/heads/main"),
)
with patch_git(ls):
result = resolve("js", "refs/heads/release/sdk-v0.17", None)
assert is_resolve_success(result)
assert "head" in result and result["head"] is True
assert result["tag"] == "release/sdk-v0.17"
assert result["sha"] == SHA40


# ---------------------------------------------------------------------------
# resolve() — SHA inputs
Expand Down
Loading