fix and minor refactor (branch_parent must not be None anyway)

fixes https://github.com/vcstools/wstool/issues/20