Browse Source

add infrastructure for checking out branches

OPENBSD_5_7
Brent Cook 9 years ago
parent
commit
ba44f5bc11
2 changed files with 3 additions and 1 deletions
  1. +1
    -0
      OPENBSD_BRANCH
  2. +2
    -1
      update.sh

+ 1
- 0
OPENBSD_BRANCH View File

@ -0,0 +1 @@
master

+ 2
- 1
update.sh View File

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
set -e set -e
openbsd_branch=`cat OPENBSD_BRANCH`
openntpd_version=`cat VERSION` openntpd_version=`cat VERSION`
# pull in latest upstream code # pull in latest upstream code
@ -13,7 +14,7 @@ if [ ! -d openbsd ]; then
fi fi
fi fi
(cd openbsd (cd openbsd
git checkout master
git checkout $openbsd_branch
git pull --rebase) git pull --rebase)
# setup source paths # setup source paths


Loading…
Cancel
Save