Skip to content

Fix remote branch fetching and revision lookup in update.sh#1235

Merged
botovq merged 1 commit intolibressl:masterfrom
nak3:fix-git-remote
Mar 4, 2026
Merged

Fix remote branch fetching and revision lookup in update.sh#1235
botovq merged 1 commit intolibressl:masterfrom
nak3:fix-git-remote

Conversation

@nak3
Copy link
Member

@nak3 nak3 commented Feb 20, 2026

This patch changes to:

  • add --no-single-branch to git clone to ensure all remote branches are tracked, allowing the script to switch between OpenBSD versions.

  • use origin/ prefix for $openbsd_branch to fix revision lookup At initial setup, the branch only exists as a "remote-tracking" reference. Since a local branch hasn't been created yet, git cannot find it by name alone. Adding the origin/ prefix explicitly tells git to look into the remote data we just fetched.

This ensures the script can correctly identify the commit hash based on the release timestamp even on a fresh shallow clone.

Fix #1233

This patch changes to:

- add `--no-single-branch` to git clone to ensure all remote branches
  are tracked, allowing the script to switch between OpenBSD versions.

- use origin/ prefix for $openbsd_branch to fix revision lookup
  At initial setup, the branch only exists as a "remote-tracking"
  reference. Since a local branch hasn't been created yet, git cannot
  find it by name alone. Adding the origin/ prefix explicitly tells
  git to look into the remote data we just fetched.

This ensures the script can correctly identify the commit hash based
on the release timestamp even on a fresh shallow clone.

Fix libressl#1233
@botovq botovq merged commit 47c332a into libressl:master Mar 4, 2026
46 checks passed
@sjaeckel
Copy link

Would it maybe make sense to pick this patch to the OPENBSD_7_8 branch?

@botovq
Copy link
Contributor

botovq commented Mar 13, 2026

@sjaeckel, if it helps you, sure, let's see what CI says to #1241

@botovq
Copy link
Contributor

botovq commented Mar 13, 2026

@sjaeckel the OPENBSD_7_8 branch should be fixed. There are currently no plans for a 4.2.2 release, so the tag will remain broken in your CI in the foreseeable future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build v4.2.1 and v4.2.0 on macOS

4 participants