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

* ci/forbid-unwanted-current-branch-update:
  Show interpreted branch name in error messages
  Prevent force-updating of the current branch

diff --cc branch.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/checkout.c
Simple merge