Fix current-branch logic

Wouldn't correctly find the name if you were on storenet

also, pop != shift