Merge branch 'jc/1.7.0-push-safety'

* jc/1.7.0-push-safety:
  Refuse deleting the current branch via push
  Refuse updating the current branch in a non-bare repository via push

diff --cc builtin-receive-pack.c
Simple merge

diff --cc t/t5516-fetch-push.sh
Simple merge