Move better_branch_name above get_ref in merge-recursive.