diff options
| author | Theo Buehler <tb@openbsd.org> | 2026-03-04 11:28:41 +0100 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2026-03-04 11:28:41 +0100 |
| commit | 47c332a802e83b3baa8aa9f98e397ffc14ef668b (patch) | |
| tree | d1b304e231d73e97be55d05719bcd14a878ac0d3 | |
| parent | 2fa8b0da90a99d04ec9d12b932a824056bd321d3 (diff) | |
| parent | 43a1f7c7e6578bc38d130b235d75916e5e58f335 (diff) | |
| download | portable-47c332a802e83b3baa8aa9f98e397ffc14ef668b.tar.gz portable-47c332a802e83b3baa8aa9f98e397ffc14ef668b.tar.bz2 portable-47c332a802e83b3baa8aa9f98e397ffc14ef668b.zip | |
Land #1235 - fix remote branch fetching
| -rwxr-xr-x | update.sh | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -21,7 +21,7 @@ openbsd_branch=`cat OPENBSD_BRANCH` | |||
| 21 | # pull in latest upstream code | 21 | # pull in latest upstream code |
| 22 | echo "pulling upstream openbsd source" | 22 | echo "pulling upstream openbsd source" |
| 23 | if [ ! -d openbsd ]; then | 23 | if [ ! -d openbsd ]; then |
| 24 | LIBRESSL_GIT_OPTIONS="${LIBRESSL_GIT_OPTIONS:- --depth=8}" | 24 | LIBRESSL_GIT_OPTIONS="${LIBRESSL_GIT_OPTIONS:- --depth=8 --no-single-branch}" |
| 25 | LIBRESSL_GIT="${LIBRESSL_GIT:- https://github.com/libressl}" | 25 | LIBRESSL_GIT="${LIBRESSL_GIT:- https://github.com/libressl}" |
| 26 | git clone $LIBRESSL_GIT_OPTIONS $LIBRESSL_GIT/openbsd | 26 | git clone $LIBRESSL_GIT_OPTIONS $LIBRESSL_GIT/openbsd |
| 27 | fi | 27 | fi |
| @@ -32,7 +32,7 @@ tag=`git describe --exact-match --tags HEAD 2>/dev/null` | |||
| 32 | is_tag=$? | 32 | is_tag=$? |
| 33 | # adjust for 9 hour time delta between trees | 33 | # adjust for 9 hour time delta between trees |
| 34 | release_ts=$((`git show -s --format=%ct $tag|tail -1` + 32400)) | 34 | release_ts=$((`git show -s --format=%ct $tag|tail -1` + 32400)) |
| 35 | commit=`git -C openbsd rev-list -n 1 --before=$release_ts $openbsd_branch` | 35 | commit=`git -C openbsd rev-list -n 1 --before=$release_ts origin/$openbsd_branch` |
| 36 | git -C openbsd fetch | 36 | git -C openbsd fetch |
| 37 | if [ $is_tag -eq 0 ]; then | 37 | if [ $is_tag -eq 0 ]; then |
| 38 | echo "This is tag $tag, trying OpenBSD tag libressl-$tag" | 38 | echo "This is tag $tag, trying OpenBSD tag libressl-$tag" |