update.sh assumes git branch.autosetupmerge = true

[dubiousjim]

update.sh contains the lines:

(cd openbsd
 git fetch
 git checkout $openbsd_branch
 git pull --rebase)

If one has branch.autosetupmerge = false in one's .gitconfig, these lines will fail because when one checkouts the branch for the first time, it won't be set as tracking its remote counterpart, and so the git pull --rebase will fail.

Now you could just shrug your shoulders and say, devs who use this repo shouldn't have those git settings; or they should keep the openbsd repo persistent on their machine and change the settings there locally.

On the other hand, it would also be trivial to fix this:

1. Either by changing git pull --rebase to git pull --rebase origin $openbsd_branch.
2. Or by changing the checkout line to git -c branch.autosetupmerge=true checkout $openbsd_branch.