From ba44f5bc11803bc190077a849ca1bcf2dbcd5e39 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 25 Sep 2015 23:44:44 -0500 Subject: [PATCH] add infrastructure for checking out branches --- OPENBSD_BRANCH | 1 + update.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 OPENBSD_BRANCH diff --git a/OPENBSD_BRANCH b/OPENBSD_BRANCH new file mode 100644 index 0000000..1f7391f --- /dev/null +++ b/OPENBSD_BRANCH @@ -0,0 +1 @@ +master diff --git a/update.sh b/update.sh index c4e6f07..1e2b1ff 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,7 @@ #!/bin/sh set -e +openbsd_branch=`cat OPENBSD_BRANCH` openntpd_version=`cat VERSION` # pull in latest upstream code @@ -13,7 +14,7 @@ if [ ! -d openbsd ]; then fi fi (cd openbsd - git checkout master + git checkout $openbsd_branch git pull --rebase) # setup source paths