diff options
author | Brent Cook <busterb@gmail.com> | 2023-02-13 16:59:34 -0600 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2023-02-13 20:36:37 -0600 |
commit | e4c35bbde4335c3d1d5f7a841b35c669e955ddc8 (patch) | |
tree | d7758f4c0f5f80260243c9c91464844ce86291bc | |
parent | 5427234a789706dcd469d932fb633e4a7f0226ca (diff) | |
download | portable-e4c35bbde4335c3d1d5f7a841b35c669e955ddc8.tar.gz portable-e4c35bbde4335c3d1d5f7a841b35c669e955ddc8.tar.bz2 portable-e4c35bbde4335c3d1d5f7a841b35c669e955ddc8.zip |
Revert "pin master build to upstream commit"
This reverts commit a7ca886cb03e52718b51f9dd35ea15f28db71a2b.
-rw-r--r-- | OPENBSD_BRANCH | 2 | ||||
-rwxr-xr-x | update.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OPENBSD_BRANCH b/OPENBSD_BRANCH index d9fd42d..1f7391f 100644 --- a/OPENBSD_BRANCH +++ b/OPENBSD_BRANCH | |||
@@ -1 +1 @@ | |||
5f0541740b8c555fa2c751e63fae55680a69afe6 | master | ||
@@ -14,7 +14,8 @@ if [ ! -d openbsd ]; then | |||
14 | fi | 14 | fi |
15 | (cd openbsd | 15 | (cd openbsd |
16 | git fetch | 16 | git fetch |
17 | git checkout $openbsd_branch) | 17 | git checkout $openbsd_branch |
18 | git pull --rebase) | ||
18 | 19 | ||
19 | # setup source paths | 20 | # setup source paths |
20 | CWD=`pwd` | 21 | CWD=`pwd` |