Fix branch list problem

Do not add empty string to Git branch list when there are no branches
Accept current branch as convergent branch