Merge branch 'ci/forbid-unwanted-current-branch-update'

* ci/forbid-unwanted-current-branch-update:
  branch --set-upstream: regression fix

diff --cc branch.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/checkout.c
Simple merge