Merge branch 'nd/branch-error-cases' into maint

"git branch" had more cases where it did not bother to check nonsense command line parameters. * nd/branch-error-cases: branch: segfault fixes and validation