Rename S4 class git_branch slot branch_type to type
Fix broken test