Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  branch: die explicitly why when calling "git branch [-a|-r] branchname".

diff --cc builtin-branch.c
Simple merge

diff --cc t/t5403-post-checkout-hook.sh
Simple merge